Browse Source

hmp: Fix drive_add ... format=help crash

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: c4f26c9f37
Cc: qemu-stable@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
tags/v4.0.0-rc3
Markus Armbruster 5 months ago
parent
commit
ab63817119
2 changed files with 2 additions and 1 deletions
  1. 1
    1
      device-hotplug.c
  2. 1
    0
      tests/test-hmp.c

+ 1
- 1
device-hotplug.c View File

@@ -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;

+ 1
- 0
tests/test-hmp.c View File

@@ -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",

Loading…
Cancel
Save