Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7b13ec9 authored by David Brownell's avatar David Brownell Committed by Greg Kroah-Hartman
Browse files

USB: gadget: ethernet error path potential oops fix 



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: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 340ba5f9

drivers/usb/gadget/ether.c

+3 −3
Original line number Diff line number Diff line
@@ -1067,19 +1067,19 @@ set_ether_config (struct eth_dev *dev, gfp_t gfp_flags) 


	/* on error, disable any endpoints  */

	if (result < 0) {

		if (!subset_active(dev))

		if (!subset_active(dev) && dev->status_ep)

			(void) usb_ep_disable (dev->status_ep);

		dev->status = NULL;

		(void) usb_ep_disable (dev->in_ep);

		(void) usb_ep_disable (dev->out_ep);

		dev->in = NULL;

		dev->out = NULL;

	} else

	}



	/* activate non-CDC configs right away

	 * this isn't strictly according to the RNDIS spec

	 */

	if (!cdc_active (dev)) {

	else if (!cdc_active (dev)) {

		netif_carrier_on (dev->net);

		if (netif_running (dev->net)) {

			spin_unlock (&dev->lock);