Commit 56f9dde4 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

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: 816ac92e
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: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <20200505101908.6207-3-armbru@redhat.com>
Acked-by: default avatarPaul Durrant <paul@xen.org>
parent 75de4efa

hw/usb/xen-usb.c

+9 −10
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include "hw/usb.h"

#include "hw/xen/xen-legacy-backend.h"

#include "monitor/qdev.h"

#include "qapi/error.h"

#include "qapi/qmp/qdict.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, "hostbus", atoi(busid));

    qdict_put_str(qdict, "hostport", portname);

    opts = qemu_opts_from_qdict(qemu_find_opts("device"), qdict, &local_err);

    if (local_err) {

        goto err;

    }

    opts = qemu_opts_from_qdict(qemu_find_opts("device"), qdict,

                                &error_abort);

    usbif->ports[port - 1].dev = USB_DEVICE(qdev_device_add(opts, &local_err));

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

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



    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)