qemu: hotplug: Fix double free on USB collision

If we hit a collision, we free the USB device while it is still part
of our temporary USBDeviceList. When the list is unref'd, the device
is free'd again.

Make the initial device freeing dependent on whether it is present
in the temporary list or not.

(cherry picked from commit 5953a73787b50da56e2ee820a8095ccb09c7a79b)
This commit is contained in:
Cole Robinson 2013-12-05 15:03:00 -05:00
parent 8a4762ec84
commit 4891858730

View File

@ -1501,7 +1501,10 @@ cleanup:
}
if (added)
virUSBDeviceListSteal(driver->activeUsbHostdevs, usb);
virUSBDeviceFree(usb);
if (list && usb &&
!virUSBDeviceListFind(list, usb) &&
!virUSBDeviceListFind(driver->activeUsbHostdevs, usb))
virUSBDeviceFree(usb);
virObjectUnref(list);
VIR_FREE(devstr);
return ret;