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

Commit d29c7a1a authored by Oliver Neukum's avatar Oliver Neukum Committed by Greg Kroah-Hartman
Browse files

hso: fix bailout in error case of probe 



commit 5fcfb6d0bfcda17f0d0656e4e5b3710af2bbaae5 upstream.

The driver tries to reuse code for disconnect in case
of a failed probe.
If resources need to be freed after an error in probe, the
netdev must not be freed because it has never been registered.
Fix it by telling the helper which path we are in.

Signed-off-by: default avatarOliver Neukum <oneukum@suse.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarOvidiu Panait <ovidiu.panait@windriver.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1f2b324e

drivers/net/usb/hso.c

+4 −4
Original line number Diff line number Diff line
@@ -2354,7 +2354,7 @@ static int remove_net_device(struct hso_device *hso_dev) 
}



/* Frees our network device */

static void hso_free_net_device(struct hso_device *hso_dev)

static void hso_free_net_device(struct hso_device *hso_dev, bool bailout)

{

	int i;

	struct hso_net *hso_net = dev2net(hso_dev);
@@ -2377,7 +2377,7 @@ static void hso_free_net_device(struct hso_device *hso_dev) 
	kfree(hso_net->mux_bulk_tx_buf);

	hso_net->mux_bulk_tx_buf = NULL;



	if (hso_net->net)

	if (hso_net->net && !bailout)

		free_netdev(hso_net->net);



	kfree(hso_dev);
@@ -2553,7 +2553,7 @@ static struct hso_device *hso_create_net_device(struct usb_interface *interface, 


	return hso_dev;

exit:

	hso_free_net_device(hso_dev);

	hso_free_net_device(hso_dev, true);

	return NULL;

}
@@ -3120,7 +3120,7 @@ static void hso_free_interface(struct usb_interface *interface) 
				rfkill_unregister(rfk);

				rfkill_destroy(rfk);

			}

			hso_free_net_device(network_table[i]);

			hso_free_net_device(network_table[i], false);

		}

	}

}