diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2007-03-20 22:43:22 +0100 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2007-03-23 10:55:25 +0100 |
| commit | 7a9eeb2fa1b3a3a83670b9ba08dd396beedb88f8 (patch) | |
| tree | 7007612e74d4e57425fc193e80c5505b5fd4599e | |
| parent | 12998096cc48563a04ca751965ba17c3f73a5461 (diff) | |
| download | linux-stable-7a9eeb2fa1b3a3a83670b9ba08dd396beedb88f8.tar.gz linux-stable-7a9eeb2fa1b3a3a83670b9ba08dd396beedb88f8.tar.bz2 linux-stable-7a9eeb2fa1b3a3a83670b9ba08dd396beedb88f8.zip | |
ieee1394: fix oops on "modprobe -r ohci1394" after network class_device conversion
The networking subsystem has been converted from class_device to device
but ieee1394 hasn't. This results in a 100% reproducible NULL pointer
dereference if the ohci1394 driver module is unloaded while the eth1394
module is still loaded.
http://lkml.org/lkml/2006/11/16/147
http://lkml.org/lkml/2007/3/14/4
This is a regression in 2.6.21-rc1.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Tested-by: Ismail Dönmez <ismail@pardus.org.tr>
| -rw-r--r-- | drivers/ieee1394/eth1394.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/ieee1394/eth1394.c b/drivers/ieee1394/eth1394.c index a95313521985..03e44b337eb0 100644 --- a/drivers/ieee1394/eth1394.c +++ b/drivers/ieee1394/eth1394.c @@ -584,7 +584,10 @@ static void ether1394_add_host (struct hpsb_host *host) } SET_MODULE_OWNER(dev); +#if 0 + /* FIXME - Is this the correct parent device anyway? */ SET_NETDEV_DEV(dev, &host->device); +#endif priv = netdev_priv(dev); |