ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xen: Fix and improve handling of device_add usb-host errors 

usbback_portid_add() leaks the error when qdev_device_add() fails.
Fix that.  While there, use the error to improve the error message.

The qemu_opts_from_qdict() similarly leaks on failure.  But any
failure there is a programming error.  Pass &error_abort.

Fixes: 816ac92ef7
Cc: Stefano Stabellini <sstabellini@kernel.org>
Cc: Anthony Perard <anthony.perard@citrix.com>
Cc: Paul Durrant <paul@xen.org>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: xen-devel@lists.xenproject.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20200505101908.6207-3-armbru@redhat.com>
Acked-by: Paul Durrant <paul@xen.org>
This commit is contained in:
Markus Armbruster 2020-05-05 12:19:00 +02:00
parent 75de4efa00
commit 56f9dde414
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hw/usb/xen-usb.c
View File

@ -30,6 +30,7 @@
#include "hw/usb.h" #include "hw/usb.h"
#include "hw/xen/xen-legacy-backend.h" #include "hw/xen/xen-legacy-backend.h"
#include "monitor/qdev.h" #include "monitor/qdev.h"
#include "qapi/error.h"
#include "qapi/qmp/qdict.h" #include "qapi/qmp/qdict.h"
#include "qapi/qmp/qstring.h" #include "qapi/qmp/qstring.h"
@ -755,13 +756,16 @@ static void usbback_portid_add(struct usbback_info *usbif, unsigned port,
qdict_put_int(qdict, "port", port); qdict_put_int(qdict, "port", port);
qdict_put_int(qdict, "hostbus", atoi(busid)); qdict_put_int(qdict, "hostbus", atoi(busid));
qdict_put_str(qdict, "hostport", portname); qdict_put_str(qdict, "hostport", portname);
opts = qemu_opts_from_qdict(qemu_find_opts("device"), qdict, &local_err); opts = qemu_opts_from_qdict(qemu_find_opts("device"), qdict,
if (local_err) { &error_abort);
goto err;
}
usbif->ports[port - 1].dev = USB_DEVICE(qdev_device_add(opts, &local_err)); usbif->ports[port - 1].dev = USB_DEVICE(qdev_device_add(opts, &local_err));
if (!usbif->ports[port - 1].dev) { if (!usbif->ports[port - 1].dev) {
goto err; qobject_unref(qdict);
xen_pv_printf(&usbif->xendev, 0,
"device %s could not be opened: %s\n",
busid, error_get_pretty(local_err));
error_free(local_err);
return;
} }
qobject_unref(qdict); qobject_unref(qdict);
speed = usbif->ports[port - 1].dev->speed; speed = usbif->ports[port - 1].dev->speed;
@ -793,11 +797,6 @@ static void usbback_portid_add(struct usbback_info *usbif, unsigned port,
usbback_hotplug_enq(usbif, port); usbback_hotplug_enq(usbif, port);
TR_BUS(&usbif->xendev, "port %d attached\n", port); TR_BUS(&usbif->xendev, "port %d attached\n", port);
return;
err:
qobject_unref(qdict);
xen_pv_printf(&usbif->xendev, 0, "device %s could not be opened\n", busid);
} }
static void usbback_process_port(struct usbback_info *usbif, unsigned port) static void usbback_process_port(struct usbback_info *usbif, unsigned port)