From: Gonglei <arei.gonglei@huawei.com>
Date: Fri, 19 Sep 2014 06:48:23 +0000 (+0800)
Subject: usb-storage: fix possible memory leak and missing error message
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=f0bc7fe3b75d2ae4aedb6da6f68ebb87f77d929b;p=people%2Fliuw%2Flibxenctrl-split%2Fqemu-xen.git

usb-storage: fix possible memory leak and missing error message

When scsi_bus_legacy_add_drive() return NULL, meanwhile err will
be not NULL, which will casue memory leak and missing error message.

Cc: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Gonglei <arei.gonglei@huawei.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---

diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c
index eb75f6adb..55ef6848a 100644
--- a/hw/usb/dev-storage.c
+++ b/hw/usb/dev-storage.c
@@ -624,6 +624,8 @@ static int usb_msd_initfn_storage(USBDevice *dev)
                                          s->conf.bootindex, dev->serial,
                                          &err);
     if (!scsi_dev) {
+        error_report("%s", error_get_pretty(err));
+        error_free(err);
         return -1;
     }
     s->bus.qbus.allow_hotplug = 0;