* [Qemu-devel] [PATCH v2] hmp: Fix drive_add ... format=help crash
2019-04-08 15:30 [Qemu-devel] [PATCH v2] hmp: Fix drive_add ... format=help crash Markus Armbruster
@ 2019-04-08 15:30 ` Markus Armbruster
2019-04-08 15:35 ` Dr. David Alan Gilbert
` (2 subsequent siblings)
3 siblings, 0 replies; 8+ messages in thread
From: Markus Armbruster @ 2019-04-08 15:30 UTC (permalink / raw)
To: qemu-devel; +Cc: kwolf, qemu-stable, dgilbert, qemu-block, mreitz
drive_new() returns null without setting an error when it provided
help. add_init_drive() assumes null means failure, and crashes trying
to report a null error.
Fixes: c4f26c9f37ce511e5fe629c21c180dc6eb7c5a25
Cc: qemu-stable@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
v2: Make tests/test-hmp.c cover the bug
device-hotplug.c | 2 +-
tests/test-hmp.c | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/device-hotplug.c b/device-hotplug.c
index 6090d5f1e9..6153259d71 100644
--- a/device-hotplug.c
+++ b/device-hotplug.c
@@ -48,7 +48,7 @@ static DriveInfo *add_init_drive(const char *optstr)
mc = MACHINE_GET_CLASS(current_machine);
dinfo = drive_new(opts, mc->block_default_type, &err);
- if (!dinfo) {
+ if (err) {
error_report_err(err);
qemu_opts_del(opts);
return NULL;
diff --git a/tests/test-hmp.c b/tests/test-hmp.c
index 8c49d2fdf1..54a01824dc 100644
--- a/tests/test-hmp.c
+++ b/tests/test-hmp.c
@@ -31,6 +31,7 @@ static const char *hmp_cmds[] = {
"cpu 0",
"device_add ?",
"device_add usb-mouse,id=mouse1",
+ "drive_add ignored format=help",
"mouse_button 7",
"mouse_move 10 10",
"mouse_button 0",
--
2.17.2
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [Qemu-devel] [PATCH v2] hmp: Fix drive_add ... format=help crash
2019-04-08 15:30 [Qemu-devel] [PATCH v2] hmp: Fix drive_add ... format=help crash Markus Armbruster
2019-04-08 15:30 ` Markus Armbruster
@ 2019-04-08 15:35 ` Dr. David Alan Gilbert
2019-04-08 15:35 ` Dr. David Alan Gilbert
2019-04-08 15:44 ` Kevin Wolf
2019-04-08 16:09 ` Philippe Mathieu-Daudé
3 siblings, 1 reply; 8+ messages in thread
From: Dr. David Alan Gilbert @ 2019-04-08 15:35 UTC (permalink / raw)
To: Markus Armbruster; +Cc: qemu-devel, kwolf, mreitz, qemu-block, qemu-stable
* Markus Armbruster (armbru@redhat.com) wrote:
> drive_new() returns null without setting an error when it provided
> help. add_init_drive() assumes null means failure, and crashes trying
> to report a null error.
>
> Fixes: c4f26c9f37ce511e5fe629c21c180dc6eb7c5a25
> Cc: qemu-stable@nongnu.org
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
> v2: Make tests/test-hmp.c cover the bug
>
> device-hotplug.c | 2 +-
> tests/test-hmp.c | 1 +
> 2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/device-hotplug.c b/device-hotplug.c
> index 6090d5f1e9..6153259d71 100644
> --- a/device-hotplug.c
> +++ b/device-hotplug.c
> @@ -48,7 +48,7 @@ static DriveInfo *add_init_drive(const char *optstr)
>
> mc = MACHINE_GET_CLASS(current_machine);
> dinfo = drive_new(opts, mc->block_default_type, &err);
> - if (!dinfo) {
> + if (err) {
> error_report_err(err);
> qemu_opts_del(opts);
> return NULL;
> diff --git a/tests/test-hmp.c b/tests/test-hmp.c
> index 8c49d2fdf1..54a01824dc 100644
> --- a/tests/test-hmp.c
> +++ b/tests/test-hmp.c
> @@ -31,6 +31,7 @@ static const char *hmp_cmds[] = {
> "cpu 0",
> "device_add ?",
> "device_add usb-mouse,id=mouse1",
> + "drive_add ignored format=help",
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> "mouse_button 7",
> "mouse_move 10 10",
> "mouse_button 0",
> --
> 2.17.2
>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [Qemu-devel] [PATCH v2] hmp: Fix drive_add ... format=help crash
2019-04-08 15:35 ` Dr. David Alan Gilbert
@ 2019-04-08 15:35 ` Dr. David Alan Gilbert
0 siblings, 0 replies; 8+ messages in thread
From: Dr. David Alan Gilbert @ 2019-04-08 15:35 UTC (permalink / raw)
To: Markus Armbruster; +Cc: kwolf, qemu-stable, qemu-devel, qemu-block, mreitz
* Markus Armbruster (armbru@redhat.com) wrote:
> drive_new() returns null without setting an error when it provided
> help. add_init_drive() assumes null means failure, and crashes trying
> to report a null error.
>
> Fixes: c4f26c9f37ce511e5fe629c21c180dc6eb7c5a25
> Cc: qemu-stable@nongnu.org
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
> v2: Make tests/test-hmp.c cover the bug
>
> device-hotplug.c | 2 +-
> tests/test-hmp.c | 1 +
> 2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/device-hotplug.c b/device-hotplug.c
> index 6090d5f1e9..6153259d71 100644
> --- a/device-hotplug.c
> +++ b/device-hotplug.c
> @@ -48,7 +48,7 @@ static DriveInfo *add_init_drive(const char *optstr)
>
> mc = MACHINE_GET_CLASS(current_machine);
> dinfo = drive_new(opts, mc->block_default_type, &err);
> - if (!dinfo) {
> + if (err) {
> error_report_err(err);
> qemu_opts_del(opts);
> return NULL;
> diff --git a/tests/test-hmp.c b/tests/test-hmp.c
> index 8c49d2fdf1..54a01824dc 100644
> --- a/tests/test-hmp.c
> +++ b/tests/test-hmp.c
> @@ -31,6 +31,7 @@ static const char *hmp_cmds[] = {
> "cpu 0",
> "device_add ?",
> "device_add usb-mouse,id=mouse1",
> + "drive_add ignored format=help",
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> "mouse_button 7",
> "mouse_move 10 10",
> "mouse_button 0",
> --
> 2.17.2
>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH v2] hmp: Fix drive_add ... format=help crash
2019-04-08 15:30 [Qemu-devel] [PATCH v2] hmp: Fix drive_add ... format=help crash Markus Armbruster
2019-04-08 15:30 ` Markus Armbruster
2019-04-08 15:35 ` Dr. David Alan Gilbert
@ 2019-04-08 15:44 ` Kevin Wolf
2019-04-08 15:44 ` Kevin Wolf
2019-04-08 16:09 ` Philippe Mathieu-Daudé
3 siblings, 1 reply; 8+ messages in thread
From: Kevin Wolf @ 2019-04-08 15:44 UTC (permalink / raw)
To: Markus Armbruster; +Cc: qemu-devel, mreitz, qemu-block, dgilbert, qemu-stable
Am 08.04.2019 um 17:30 hat Markus Armbruster geschrieben:
> drive_new() returns null without setting an error when it provided
> help. add_init_drive() assumes null means failure, and crashes trying
> to report a null error.
>
> Fixes: c4f26c9f37ce511e5fe629c21c180dc6eb7c5a25
> Cc: qemu-stable@nongnu.org
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
Thanks, applied to the block branch.
Kevin
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH v2] hmp: Fix drive_add ... format=help crash
2019-04-08 15:44 ` Kevin Wolf
@ 2019-04-08 15:44 ` Kevin Wolf
0 siblings, 0 replies; 8+ messages in thread
From: Kevin Wolf @ 2019-04-08 15:44 UTC (permalink / raw)
To: Markus Armbruster; +Cc: dgilbert, qemu-stable, qemu-devel, qemu-block, mreitz
Am 08.04.2019 um 17:30 hat Markus Armbruster geschrieben:
> drive_new() returns null without setting an error when it provided
> help. add_init_drive() assumes null means failure, and crashes trying
> to report a null error.
>
> Fixes: c4f26c9f37ce511e5fe629c21c180dc6eb7c5a25
> Cc: qemu-stable@nongnu.org
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
Thanks, applied to the block branch.
Kevin
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH v2] hmp: Fix drive_add ... format=help crash
2019-04-08 15:30 [Qemu-devel] [PATCH v2] hmp: Fix drive_add ... format=help crash Markus Armbruster
` (2 preceding siblings ...)
2019-04-08 15:44 ` Kevin Wolf
@ 2019-04-08 16:09 ` Philippe Mathieu-Daudé
2019-04-08 16:09 ` Philippe Mathieu-Daudé
3 siblings, 1 reply; 8+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-08 16:09 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel
Cc: kwolf, qemu-stable, dgilbert, qemu-block, mreitz
On 4/8/19 5:30 PM, Markus Armbruster wrote:
> drive_new() returns null without setting an error when it provided
> help. add_init_drive() assumes null means failure, and crashes trying
> to report a null error.
>
> Fixes: c4f26c9f37ce511e5fe629c21c180dc6eb7c5a25
> Cc: qemu-stable@nongnu.org
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> v2: Make tests/test-hmp.c cover the bug
>
> device-hotplug.c | 2 +-
> tests/test-hmp.c | 1 +
> 2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/device-hotplug.c b/device-hotplug.c
> index 6090d5f1e9..6153259d71 100644
> --- a/device-hotplug.c
> +++ b/device-hotplug.c
> @@ -48,7 +48,7 @@ static DriveInfo *add_init_drive(const char *optstr)
>
> mc = MACHINE_GET_CLASS(current_machine);
> dinfo = drive_new(opts, mc->block_default_type, &err);
> - if (!dinfo) {
> + if (err) {
> error_report_err(err);
> qemu_opts_del(opts);
> return NULL;
> diff --git a/tests/test-hmp.c b/tests/test-hmp.c
> index 8c49d2fdf1..54a01824dc 100644
> --- a/tests/test-hmp.c
> +++ b/tests/test-hmp.c
> @@ -31,6 +31,7 @@ static const char *hmp_cmds[] = {
> "cpu 0",
> "device_add ?",
> "device_add usb-mouse,id=mouse1",
> + "drive_add ignored format=help",
> "mouse_button 7",
> "mouse_move 10 10",
> "mouse_button 0",
>
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [Qemu-devel] [PATCH v2] hmp: Fix drive_add ... format=help crash
2019-04-08 16:09 ` Philippe Mathieu-Daudé
@ 2019-04-08 16:09 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 8+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-08 16:09 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel
Cc: kwolf, mreitz, qemu-stable, qemu-block, dgilbert
On 4/8/19 5:30 PM, Markus Armbruster wrote:
> drive_new() returns null without setting an error when it provided
> help. add_init_drive() assumes null means failure, and crashes trying
> to report a null error.
>
> Fixes: c4f26c9f37ce511e5fe629c21c180dc6eb7c5a25
> Cc: qemu-stable@nongnu.org
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> v2: Make tests/test-hmp.c cover the bug
>
> device-hotplug.c | 2 +-
> tests/test-hmp.c | 1 +
> 2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/device-hotplug.c b/device-hotplug.c
> index 6090d5f1e9..6153259d71 100644
> --- a/device-hotplug.c
> +++ b/device-hotplug.c
> @@ -48,7 +48,7 @@ static DriveInfo *add_init_drive(const char *optstr)
>
> mc = MACHINE_GET_CLASS(current_machine);
> dinfo = drive_new(opts, mc->block_default_type, &err);
> - if (!dinfo) {
> + if (err) {
> error_report_err(err);
> qemu_opts_del(opts);
> return NULL;
> diff --git a/tests/test-hmp.c b/tests/test-hmp.c
> index 8c49d2fdf1..54a01824dc 100644
> --- a/tests/test-hmp.c
> +++ b/tests/test-hmp.c
> @@ -31,6 +31,7 @@ static const char *hmp_cmds[] = {
> "cpu 0",
> "device_add ?",
> "device_add usb-mouse,id=mouse1",
> + "drive_add ignored format=help",
> "mouse_button 7",
> "mouse_move 10 10",
> "mouse_button 0",
>
^ permalink raw reply [flat|nested] 8+ messages in thread