From f3b2bea3c76ba9283b957f1373e7cebdbf863059 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Wed, 27 Sep 2017 17:28:26 +0200 Subject: hw/usb/bus: Remove bad object_unparent() from usb_try_create_simple() Valgrind detects an invalid read operation when hot-plugging of an USB device fails: $ valgrind x86_64-softmmu/qemu-system-x86_64 -device usb-ehci -nographic -S ==30598== Memcheck, a memory error detector ==30598== Copyright (C) 2002-2015, and GNU GPL'd, by Julian Seward et al. ==30598== Using Valgrind-3.12.0 and LibVEX; rerun with -h for copyright info ==30598== Command: x86_64-softmmu/qemu-system-x86_64 -device usb-ehci -nographic -S ==30598== QEMU 2.10.50 monitor - type 'help' for more information (qemu) device_add usb-tablet (qemu) device_add usb-tablet (qemu) device_add usb-tablet (qemu) device_add usb-tablet (qemu) device_add usb-tablet (qemu) device_add usb-tablet ==30598== Invalid read of size 8 ==30598== at 0x60EF50: object_unparent (object.c:445) ==30598== by 0x580F0D: usb_try_create_simple (bus.c:346) ==30598== by 0x581BEB: usb_claim_port (bus.c:451) ==30598== by 0x582310: usb_qdev_realize (bus.c:257) ==30598== by 0x4CB399: device_set_realized (qdev.c:914) ==30598== by 0x60E26D: property_set_bool (object.c:1886) ==30598== by 0x61235E: object_property_set_qobject (qom-qobject.c:27) ==30598== by 0x61000F: object_property_set_bool (object.c:1162) ==30598== by 0x4567C3: qdev_device_add (qdev-monitor.c:630) ==30598== by 0x456D52: qmp_device_add (qdev-monitor.c:807) ==30598== by 0x470A99: hmp_device_add (hmp.c:1933) ==30598== by 0x3679C3: handle_hmp_command (monitor.c:3123) The object_unparent() here is not necessary anymore since commit 69382d8b3e8600b3 ("qdev: Fix object reference leak in case device.realize() fails"), so let's remove it now. Suggested-by: Paolo Bonzini Signed-off-by: Thomas Huth Message-id: 1506526106-30971-1-git-send-email-thuth@redhat.com Signed-off-by: Gerd Hoffmann --- hw/usb/bus.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/usb/bus.c b/hw/usb/bus.c index d910f84..e56dc33 100644 --- a/hw/usb/bus.c +++ b/hw/usb/bus.c @@ -341,9 +341,7 @@ static USBDevice *usb_try_create_simple(USBBus *bus, const char *name, object_property_set_bool(OBJECT(dev), true, "realized", &err); if (err) { error_propagate(errp, err); - error_prepend(errp, "Failed to initialize USB device '%s': ", - name); - object_unparent(OBJECT(dev)); + error_prepend(errp, "Failed to initialize USB device '%s': ", name); return NULL; } return dev; -- cgit v1.1 From 275d477a1adb084a47859507b20b05e7d65f8e8d Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Tue, 26 Sep 2017 08:38:20 +0200 Subject: usb: fix libusb config variable name. Cc: Jan Kiszka Fixes: 4e5ee5b21c84fe3023a64b5cc2e12a52ab0597c1 Signed-off-by: Gerd Hoffmann Tested-by: Jan Kiszka Message-id: 20170926063820.30773-1-kraxel@redhat.com --- hw/usb/Makefile.objs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs index 9255234..0e6d54b 100644 --- a/hw/usb/Makefile.objs +++ b/hw/usb/Makefile.objs @@ -42,7 +42,7 @@ redirect.o-cflags = $(USB_REDIR_CFLAGS) redirect.o-libs = $(USB_REDIR_LIBS) # usb pass-through -ifeq ($(CONFIG_LIBUSB)$(CONFIG_USB),yy) +ifeq ($(CONFIG_USB_LIBUSB)$(CONFIG_USB),yy) common-obj-y += host-libusb.o host-legacy.o else common-obj-y += host-stub.o -- cgit v1.1 From 13787d59cf86bac230c4d3eec3580110f53ac113 Mon Sep 17 00:00:00 2001 From: Fam Zheng Date: Wed, 20 Sep 2017 16:59:52 +0800 Subject: usb: Use angle brackets for cacard include directive This is a library header, so angle brackets are more appropriate; also move the line to before QEMU headers, as is recommended in HACKING. Signed-off-by: Fam Zheng Message-id: 20170920085952.3872-1-famz@redhat.com Signed-off-by: Gerd Hoffmann --- hw/usb/ccid-card-passthru.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c index 45d96b0..1177118 100644 --- a/hw/usb/ccid-card-passthru.c +++ b/hw/usb/ccid-card-passthru.c @@ -9,11 +9,11 @@ */ #include "qemu/osdep.h" +#include #include "chardev/char-fe.h" #include "qemu/error-report.h" #include "qemu/sockets.h" #include "ccid.h" -#include "cacard/vscard_common.h" #define DPRINTF(card, lvl, fmt, ...) \ do { \ -- cgit v1.1 From eea6ae20379dca837631d603c3bed03e5128189f Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Wed, 4 Oct 2017 14:52:10 +0200 Subject: usb: fix host-stub.c build race Suggested-by: Thomas Huth Signed-off-by: Gerd Hoffmann Reviewed-by: Thomas Huth Message-id: 20171004125210.7817-1-kraxel@redhat.com --- hw/usb/Makefile.objs | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs index 0e6d54b..bdfead6 100644 --- a/hw/usb/Makefile.objs +++ b/hw/usb/Makefile.objs @@ -47,6 +47,7 @@ common-obj-y += host-libusb.o host-legacy.o else common-obj-y += host-stub.o endif +common-obj-$(CONFIG_ALL) += host-stub.o host-libusb.o-cflags := $(LIBUSB_CFLAGS) host-libusb.o-libs := $(LIBUSB_LIBS) -- cgit v1.1