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

Commit e0579d57 authored by Marc Pignat's avatar Marc Pignat Committed by John W. Linville
Browse files

[PATCH] zd1211rw, fix oops when ejecting install media 



The disconnect function can dereference the net_device structure when it
is never allocated. This is the case when ejecting the device installer.

Signed-off-by: default avatarMarc Pignat <marc.pignat@hevs.ch>
Acked-by: default avatarDaniel Drake <dsd@gentoo.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 208eec88

drivers/net/wireless/zd1211rw/zd_usb.c

+5 −2
Original line number Diff line number Diff line
@@ -1044,14 +1044,17 @@ static int probe(struct usb_interface *intf, const struct usb_device_id *id) 
static void disconnect(struct usb_interface *intf)

{

	struct net_device *netdev = zd_intf_to_netdev(intf);

	struct zd_mac *mac = zd_netdev_mac(netdev);

	struct zd_usb *usb = &mac->chip.usb;

	struct zd_mac *mac;

	struct zd_usb *usb;



	/* Either something really bad happened, or we're just dealing with

	 * a DEVICE_INSTALLER. */

	if (netdev == NULL)

		return;



	mac = zd_netdev_mac(netdev);

	usb = &mac->chip.usb;



	dev_dbg_f(zd_usb_dev(usb), "\n");



	zd_netdev_disconnect(netdev);