[GIT PULL] ieee1394 fix



Linus, please pull from the for-linus branch at

git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git for-linus

to receive the appended fix for 2.6.21-rc4. Or apply from this mail.
Thanks.

(The eth1394 issue will be revised as soon as ieee1394 core got rid of
class_Device.)

drivers/ieee1394/eth1394.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)

Stefan Richter (1):
ieee1394: fix oops on "modprobe -r ohci1394" after network class_device conversion



From 7a9eeb2fa1b3a3a83670b9ba08dd396beedb88f8 Mon Sep 17 00:00:00 2001
From: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
Date: Tue, 20 Mar 2007 22:43:22 +0100
Subject: [PATCH] ieee1394: fix oops on "modprobe -r ohci1394" after network class_device conversion
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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@xxxxxxxxxxxxxxxxx>
Tested-by: Ismail Dönmez <ismail@xxxxxxxxxxxxx>
---
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 a953135..03e44b3 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);

--
1.4.4.4





-
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/



Relevant Pages

  • Re: [GIT PATCH] SCSI fixes for 2.6.19-rc3
    ... qla2xxx: ... megaraid_: 64-bit DMA capability fix ... Scsi_Cmnd conversion in qlogicfas408 driver ... libiscsi: fix logout pdu processing ...
    (Linux-Kernel)
  • Re: Graphic Freeze
    ... I'm not aware of the 64 to 32 bit conversion issue that you were told about, ... Use compressed air for hard to reach places. ... Visit my MSN Zone.com and Gaming Help Site: http://mvps.org/nibblesnbits ... | of 64 bit to 32 bit conversion or some sort and that a fix was released. ...
    (microsoft.public.windowsxp.games)
  • Re: Open XML Converter error when opening .pptx files
    ... My error message read: ... "Conversion Error: An error occurred while converting your file. ... To fix the problem, go online and download the converter again. ... updated Word to 11.5.3 but PowerPoint is still 11.5.1. ...
    (microsoft.public.mac.office.powerpoint)
  • Re: [PATCH 01/12] Use mutex instead of semaphore in driver core
    ... Please fix that warning before the next repost of these patches (along ... Ok, thanks, I will fix them and repost. ... My question back to you is why are you doing this conversion? ...
    (Linux-Kernel)