* [Qemu-devel] [PATCH for-4.0] hmp: Fix drive_add ... format=help crash
@ 2019-04-05 11:45 Markus Armbruster
2019-04-05 11:45 ` Markus Armbruster
2019-04-05 12:51 ` Kevin Wolf
0 siblings, 2 replies; 8+ messages in thread
From: Markus Armbruster @ 2019-04-05 11:45 UTC (permalink / raw)
To: qemu-devel; +Cc: kwolf, mreitz, qemu-block, qemu-stable
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>
---
device-hotplug.c | 2 +-
1 file changed, 1 insertion(+), 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;
--
2.17.2
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Qemu-devel] [PATCH for-4.0] hmp: Fix drive_add ... format=help crash
2019-04-05 11:45 [Qemu-devel] [PATCH for-4.0] hmp: Fix drive_add ... format=help crash Markus Armbruster
@ 2019-04-05 11:45 ` Markus Armbruster
2019-04-05 12:51 ` Kevin Wolf
1 sibling, 0 replies; 8+ messages in thread
From: Markus Armbruster @ 2019-04-05 11:45 UTC (permalink / raw)
To: qemu-devel; +Cc: kwolf, qemu-stable, 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>
---
device-hotplug.c | 2 +-
1 file changed, 1 insertion(+), 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;
--
2.17.2
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [Qemu-devel] [PATCH for-4.0] hmp: Fix drive_add ... format=help crash
2019-04-05 11:45 [Qemu-devel] [PATCH for-4.0] hmp: Fix drive_add ... format=help crash Markus Armbruster
2019-04-05 11:45 ` Markus Armbruster
@ 2019-04-05 12:51 ` Kevin Wolf
2019-04-05 12:51 ` Kevin Wolf
2019-04-05 16:11 ` Dr. David Alan Gilbert
1 sibling, 2 replies; 8+ messages in thread
From: Kevin Wolf @ 2019-04-05 12:51 UTC (permalink / raw)
To: Markus Armbruster; +Cc: qemu-devel, mreitz, qemu-block, qemu-stable
Am 05.04.2019 um 13:45 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>
We should probably have a test case for this.
Kevin
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH for-4.0] hmp: Fix drive_add ... format=help crash
2019-04-05 12:51 ` Kevin Wolf
@ 2019-04-05 12:51 ` Kevin Wolf
2019-04-05 16:11 ` Dr. David Alan Gilbert
1 sibling, 0 replies; 8+ messages in thread
From: Kevin Wolf @ 2019-04-05 12:51 UTC (permalink / raw)
To: Markus Armbruster; +Cc: qemu-stable, qemu-devel, qemu-block, mreitz
Am 05.04.2019 um 13:45 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>
We should probably have a test case for this.
Kevin
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH for-4.0] hmp: Fix drive_add ... format=help crash
2019-04-05 12:51 ` Kevin Wolf
2019-04-05 12:51 ` Kevin Wolf
@ 2019-04-05 16:11 ` Dr. David Alan Gilbert
2019-04-05 16:11 ` Dr. David Alan Gilbert
2019-04-05 16:24 ` Kevin Wolf
1 sibling, 2 replies; 8+ messages in thread
From: Dr. David Alan Gilbert @ 2019-04-05 16:11 UTC (permalink / raw)
To: Kevin Wolf; +Cc: Markus Armbruster, qemu-stable, qemu-devel, qemu-block, mreitz
* Kevin Wolf (kwolf@redhat.com) wrote:
> Am 05.04.2019 um 13:45 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>
>
> We should probably have a test case for this.
Perhaps just adding:
drive_add 0 format=help
to the hmp_cmds list in tests/test-hmp.c ?
Dave
> Kevin
>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH for-4.0] hmp: Fix drive_add ... format=help crash
2019-04-05 16:11 ` Dr. David Alan Gilbert
@ 2019-04-05 16:11 ` Dr. David Alan Gilbert
2019-04-05 16:24 ` Kevin Wolf
1 sibling, 0 replies; 8+ messages in thread
From: Dr. David Alan Gilbert @ 2019-04-05 16:11 UTC (permalink / raw)
To: Kevin Wolf; +Cc: qemu-devel, mreitz, Markus Armbruster, qemu-block, qemu-stable
* Kevin Wolf (kwolf@redhat.com) wrote:
> Am 05.04.2019 um 13:45 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>
>
> We should probably have a test case for this.
Perhaps just adding:
drive_add 0 format=help
to the hmp_cmds list in tests/test-hmp.c ?
Dave
> Kevin
>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH for-4.0] hmp: Fix drive_add ... format=help crash
2019-04-05 16:11 ` Dr. David Alan Gilbert
2019-04-05 16:11 ` Dr. David Alan Gilbert
@ 2019-04-05 16:24 ` Kevin Wolf
2019-04-05 16:24 ` Kevin Wolf
1 sibling, 1 reply; 8+ messages in thread
From: Kevin Wolf @ 2019-04-05 16:24 UTC (permalink / raw)
To: Dr. David Alan Gilbert
Cc: Markus Armbruster, qemu-stable, qemu-devel, qemu-block, mreitz
Am 05.04.2019 um 18:11 hat Dr. David Alan Gilbert geschrieben:
> * Kevin Wolf (kwolf@redhat.com) wrote:
> > Am 05.04.2019 um 13:45 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>
> >
> > We should probably have a test case for this.
>
> Perhaps just adding:
>
> drive_add 0 format=help
>
> to the hmp_cmds list in tests/test-hmp.c ?
This would catch the crash, but not check the output. I think I'd prefer
a qemu-iotests case where the output is checked.
Kevin
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH for-4.0] hmp: Fix drive_add ... format=help crash
2019-04-05 16:24 ` Kevin Wolf
@ 2019-04-05 16:24 ` Kevin Wolf
0 siblings, 0 replies; 8+ messages in thread
From: Kevin Wolf @ 2019-04-05 16:24 UTC (permalink / raw)
To: Dr. David Alan Gilbert
Cc: qemu-devel, mreitz, Markus Armbruster, qemu-block, qemu-stable
Am 05.04.2019 um 18:11 hat Dr. David Alan Gilbert geschrieben:
> * Kevin Wolf (kwolf@redhat.com) wrote:
> > Am 05.04.2019 um 13:45 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>
> >
> > We should probably have a test case for this.
>
> Perhaps just adding:
>
> drive_add 0 format=help
>
> to the hmp_cmds list in tests/test-hmp.c ?
This would catch the crash, but not check the output. I think I'd prefer
a qemu-iotests case where the output is checked.
Kevin
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2019-04-05 16:33 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-04-05 11:45 [Qemu-devel] [PATCH for-4.0] hmp: Fix drive_add ... format=help crash Markus Armbruster
2019-04-05 11:45 ` Markus Armbruster
2019-04-05 12:51 ` Kevin Wolf
2019-04-05 12:51 ` Kevin Wolf
2019-04-05 16:11 ` Dr. David Alan Gilbert
2019-04-05 16:11 ` Dr. David Alan Gilbert
2019-04-05 16:24 ` Kevin Wolf
2019-04-05 16:24 ` Kevin Wolf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).