From: Stefan Richter Date: Tue, 20 Mar 2007 21:43:22 +0000 (+0100) Subject: ieee1394: fix oops on "modprobe -r ohci1394" after network class_device conversion X-Git-Tag: v2.6.21-rc5~20^2 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a9eeb2fa1b3a3a83670b9ba08dd396beedb88f8;p=linux-2.6 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 Tested-by: Ismail Dönmez --- diff --git a/drivers/ieee1394/eth1394.c b/drivers/ieee1394/eth1394.c index a953135219..03e44b337e 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);