sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libpayload/drivers/usb: Fix leaks

Browse Source 
Don't leak buffers on device detach.

Tested on qemu using:
qemu-system-x86_64 -bios build/coreboot.rom -M pc -m 2048 -usb \
 -device usb-ehci,id=ehci -device usb-mouse -device usb-audio,bus=usb-bus.0 \
 -device usb-bt-dongle,bus=usb-bus.0 -device usb-kbd

Change-Id: Ib2d80dd4590aa0dacdf2da3b614c6505c931d0be
Signed-off-by: Patrick Rudolph <siro@das-labor.org>
Reviewed-on: https://review.coreboot.org/23689
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
This commit is contained in:
Patrick Rudolph
2018-02-10 12:03:58 +01:00
committed by Nico Huber
parent d5a70bdfd5
commit 1fea734e54
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
payloads/libpayload/drivers/usb/usb.c
View File

@@ -638,8 +638,15 @@ usb_detach_device(hci_t *controller, int devno)
been called yet by the usb class driver */ been called yet by the usb class driver */
if (controller->devices[devno]) { if (controller->devices[devno]) {
controller->devices[devno]->destroy (controller->devices[devno]); controller->devices[devno]->destroy (controller->devices[devno]);
if (controller->destroy_device) if (controller->destroy_device)
controller->destroy_device(controller, devno); controller->destroy_device(controller, devno);
free(controller->devices[devno]->descriptor);
controller->devices[devno]->descriptor = NULL;
free(controller->devices[devno]->configuration);
controller->devices[devno]->configuration = NULL;
/* Tear down the device itself *after* destroy_device() /* Tear down the device itself *after* destroy_device()
* has had a chance to interoogate it. */ * has had a chance to interoogate it. */
free(controller->devices[devno]); free(controller->devices[devno]);

5
payloads/libpayload/drivers/usb/usb_dev.c
View File

@@ -32,8 +32,6 @@
static void static void
usb_nop_destroy (usbdev_t *dev) usb_nop_destroy (usbdev_t *dev)
{ {
if (dev->descriptor != 0)
free (dev->descriptor);
usb_nop_init (dev); usb_nop_init (dev);
dev->address = -1; dev->address = -1;
dev->hub = -1; dev->hub = -1;
@@ -49,7 +47,8 @@ usb_nop_poll (usbdev_t *dev)
void void
usb_nop_init (usbdev_t *dev) usb_nop_init (usbdev_t *dev)
{ {
dev->descriptor = 0; dev->descriptor = NULL;
dev->configuration = NULL;
dev->destroy = usb_nop_destroy; dev->destroy = usb_nop_destroy;
dev->poll = usb_nop_poll; dev->poll = usb_nop_poll;
} }

3
payloads/libpayload/drivers/usb/usbhid.c
View File

@@ -80,6 +80,9 @@ usb_hid_destroy (usbdev_t *dev)
&dev->endpoints[i], HID_INST(dev)->queue); &dev->endpoints[i], HID_INST(dev)->queue);
HID_INST(dev)->queue = NULL; HID_INST(dev)->queue = NULL;
} }
free(HID_INST(dev)->descriptor);
HID_INST(dev)->descriptor = NULL;
free (dev->data); free (dev->data);
} }