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 <[email protected]>
---
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);
Hi all!
On Monday 15 October 2007, Daniel Drake wrote:
...
> Acked-by: Daniel Drake <[email protected]>
Is there any hope to apply this to 2.6.23.2, as this is a regression fix?
Regards
Marc
Marc Pignat wrote:
> Hi all!
>
> On Monday 15 October 2007, Daniel Drake wrote:
> ...
>> Acked-by: Daniel Drake <[email protected]>
>
> Is there any hope to apply this to 2.6.23.2, as this is a regression fix?
Yes, already planned, it just has to go upstream first.
Thanks,
Daniel
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 <[email protected]>
s/before it is allocated/when it is never allocated/
Acked-by: Daniel Drake <[email protected]>
> ---
>
> 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);
>
>