lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

USB: gadget: ethernet error path potential oops fix

Browse Source 
Fix potential (never-observed) oops on rare error path,
bugzilla #9594.  Fix uses the same test as used earlier.

Also make the adjacent "else" block look like an "else" block
instead of hiding like a bug.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
David Brownell
2007-12-19 11:27:51 -08:00
committed by Greg Kroah-Hartman
parent 340ba5f9ce
commit e7b13ec923
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/usb/gadget/ether.c
View File

@@ -1067,19 +1067,19 @@ done:
/* on error, disable any endpoints */ /* on error, disable any endpoints */
if (result < 0) { if (result < 0) {
if (!subset_active(dev)) if (!subset_active(dev) && dev->status_ep)
(void) usb_ep_disable (dev->status_ep); (void) usb_ep_disable (dev->status_ep);
dev->status = NULL; dev->status = NULL;
(void) usb_ep_disable (dev->in_ep); (void) usb_ep_disable (dev->in_ep);
(void) usb_ep_disable (dev->out_ep); (void) usb_ep_disable (dev->out_ep);
dev->in = NULL; dev->in = NULL;
dev->out = NULL; dev->out = NULL;
} else }
/* activate non-CDC configs right away /* activate non-CDC configs right away
* this isn't strictly according to the RNDIS spec * this isn't strictly according to the RNDIS spec
*/ */
if (!cdc_active (dev)) { else if (!cdc_active (dev)) {
netif_carrier_on (dev->net); netif_carrier_on (dev->net);
if (netif_running (dev->net)) { if (netif_running (dev->net)) {
spin_unlock (&dev->lock); spin_unlock (&dev->lock);