github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-09 07:03:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

usb: gadget: composite: Fix corruption when changing configuration

Browse Source 
Remove the config from the configs list before releasing the spinlock.
Otherwise the other cpu might be processing a SET_CONFIGURATION that
will switch to the configuration that is being released.

Bug: 6521576
Change-Id: Id4da0d0e18ead63e20cb236cd1d3e8e6d116acce
Signed-off-by: Benoit Goby <benoit@android.com>
This commit is contained in:
Benoit Goby 2012-05-15 20:44:33 -07:00
parent 605a493298
commit 8b5855f54d
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -564,7 +564,7 @@ int usb_add_config(struct usb_composite_dev *cdev,
return status;
}
static int remove_config(struct usb_composite_dev *cdev,
static int unbind_config(struct usb_composite_dev *cdev,
struct usb_configuration *config)
{
while (!list_empty(&config->functions)) {
@ -579,7 +579,6 @@ static int remove_config(struct usb_composite_dev *cdev,
/* may free memory for "f" */
}
}
list_del(&config->list);
if (config->unbind) {
DBG(cdev, "unbind config '%s'/%p\n", config->label, config);
config->unbind(config);
@ -598,9 +597,11 @@ int usb_remove_config(struct usb_composite_dev *cdev,
if (cdev->config == config)
reset_config(cdev);
list_del(&config->list);
spin_unlock_irqrestore(&cdev->lock, flags);
return remove_config(cdev, config);
return unbind_config(cdev, config);
}
/*-------------------------------------------------------------------------*/
@ -1084,7 +1085,8 @@ composite_unbind(struct usb_gadget *gadget)
struct usb_configuration *c;
c = list_first_entry(&cdev->configs,
struct usb_configuration, list);
remove_config(cdev, c);
list_del(&c->list);
unbind_config(cdev, c);
}
if (composite->unbind)
composite->unbind(cdev);