Re: [PATCH] zd1211rw, fix oops when ejecting install media

[Daniel Drake]

Marc Pignat wrote:
> The disconnect function can dereference the net_device structure before it is
> allocated. This is the case when ejecting the device installer.
>
> Signed-off-by: Marc Pignat <marc.pignat@xxxxxxx>

s/before it is allocated/when it is never allocated/

Acked-by: Daniel Drake <dsd@xxxxxxxxxx>

> ---
>
> Hello!
>
> Patch against 2.6.23.
> This patch fixes the bug I've submitted to linux-wireless friday in the
> "zd1211rw on 2.6.23 oops ejecting device" thread.
>
> Regards
>
> Marc
>
> --- drivers/net/wireless/zd1211rw/zd_usb.c.orig	2007-10-15 08:29:16.000000000 +0200
> +++ drivers/net/wireless/zd1211rw/zd_usb.c	2007-10-15 08:29:32.000000000 +0200
> @@ -1041,14 +1041,17 @@ error:
>  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);

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/