LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb: gadget: don't leak configs when unbinding 

By the time g_dnl_unbind() is run, cdev->config has been set to NULL,
so the free() there does nothing, and the config struct is leaked.
Equally, struct usb_gadget contains a linked list of config structs, so
the code should iterate over them all and free each one, rather than
freeing one particular config struct.

composite_unbind() already iterates over the list of config structs, and
unlinks each from the linked list. Fix this loop to free() each struct as
it's unlinked and otherwise forgotten.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Lukasz Majewski <l.majewski@samsung.com>
Tested-by: Lukasz Majewski <l.majewski@samsung.com>
This commit is contained in:
Stephen Warren 2015-09-04 22:03:42 -06:00 committed by Tom Rini
parent 0a04ed86cf
commit 44bfb43f9a
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/usb/gadget/composite.c
View File

@ -948,6 +948,7 @@ static void composite_unbind(struct usb_gadget *gadget)
debug("unbind config '%s'/%p\n", c->label, c); debug("unbind config '%s'/%p\n", c->label, c);
c->unbind(c); c->unbind(c);
} }
free(c);
} }
if (composite->unbind) if (composite->unbind)
composite->unbind(cdev); composite->unbind(cdev);

2
drivers/usb/gadget/g_dnl.c
View File

@ -93,8 +93,6 @@ static int g_dnl_unbind(struct usb_composite_dev *cdev)
{ {
struct usb_gadget *gadget = cdev->gadget; struct usb_gadget *gadget = cdev->gadget;
free(cdev->config);
cdev->config = NULL;
debug("%s: calling usb_gadget_disconnect for " debug("%s: calling usb_gadget_disconnect for "
"controller '%s'\n", __func__, gadget->name); "controller '%s'\n", __func__, gadget->name);
usb_gadget_disconnect(gadget); usb_gadget_disconnect(gadget);