Messages in this thread Patch in this message | | | Date | Sat, 27 Jan 2007 13:52:52 +0100 (CET) | From | Stefan Richter <> | Subject | [PATCH 1/2] ieee1394: dv1394: fix CardBus card ejection |
| |
Fix NULL pointer dereference on hot ejection of a FireWire card while dv1394 was loaded. http://bugzilla.kernel.org/show_bug.cgi?id=7121 I did not test card ejection with open /dev/dv1394 files yet.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> --- drivers/ieee1394/dv1394.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-)
Index: linux-2.6.20-rc6/drivers/ieee1394/dv1394.c =================================================================== --- linux-2.6.20-rc6.orig/drivers/ieee1394/dv1394.c 2007-01-27 13:28:39.000000000 +0100 +++ linux-2.6.20-rc6/drivers/ieee1394/dv1394.c 2007-01-27 13:30:05.000000000 +0100 @@ -2267,11 +2267,7 @@ static void dv1394_remove_host (struct h { struct video_card *video; unsigned long flags; - int id = host->id; - - /* We only work with the OHCI-1394 driver */ - if (strcmp(host->driver->name, OHCI1394_DRIVER_NAME)) - return; + int id = host->id, found_ohci_card = 0; /* find the corresponding video_cards */ do { @@ -2284,6 +2280,7 @@ static void dv1394_remove_host (struct h if ((tmp_vid->id >> 2) == id) { list_del(&tmp_vid->list); video = tmp_vid; + found_ohci_card = 1; break; } } @@ -2293,8 +2290,9 @@ static void dv1394_remove_host (struct h dv1394_un_init(video); } while (video != NULL); - class_device_destroy(hpsb_protocol_class, - MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_DV1394 * 16 + (id<<2))); + if (found_ohci_card) + class_device_destroy(hpsb_protocol_class, MKDEV(IEEE1394_MAJOR, + IEEE1394_MINOR_BLOCK_DV1394 * 16 + (host->id << 2))); } static void dv1394_add_host (struct hpsb_host *host)
-- Stefan Richter -=====-=-=== ---= ==-== http://arcgraph.de/sr/ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |