[<prev] [next>] [day] [month] [year] [list]
Message-ID: <tkrat.482ea841bba43a82@s5r6.in-berlin.de>
Date: Thu, 1 May 2008 20:06:30 +0200 (CEST)
From: Stefan Richter <stefanr@...6.in-berlin.de>
To: Linus Torvalds <torvalds@...ux-foundation.org>,
Andrew Morton <akpm@...ux-foundation.org>
cc: linux-kernel@...r.kernel.org, linux1394-devel@...ts.sourceforge.net
Subject: [GIT PULL] ieee1394 update
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 a regression fix for ieee1394 and a trivial bit for firewire.
Stefan Richter (2):
ieee1394: fix NULL pointer dereference in sysfs access
firewire: fw-sbp2: log scsi_target ID at release
drivers/firewire/fw-sbp2.c | 2 +-
drivers/ieee1394/nodemgr.c | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
Thanks.
commit f32ddaddf95d8a30be5a41cf681bc8792bc42ec7
Author: Stefan Richter <stefanr@...6.in-berlin.de>
Date: Thu Apr 24 23:17:47 2008 +0200
firewire: fw-sbp2: log scsi_target ID at release
Makes the good-by message more informative.
Signed-off-by: Stefan Richter <stefanr@...6.in-berlin.de>
Signed-off-by: Jarod Wilson <jwilson@...hat.com>
diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c
index 2a99937..62e3c91 100644
--- a/drivers/firewire/fw-sbp2.c
+++ b/drivers/firewire/fw-sbp2.c
@@ -784,7 +784,7 @@ static void sbp2_release_target(struct kref *kref)
kfree(lu);
}
scsi_remove_host(shost);
- fw_notify("released %s\n", tgt->bus_id);
+ fw_notify("released %s, target %d:0:0\n", tgt->bus_id, shost->host_no);
fw_unit_put(tgt->unit);
scsi_host_put(shost);
commit 07c7224cf74c3977c69c7c9a0b0fba264f2df36a
Author: Stefan Richter <stefanr@...6.in-berlin.de>
Date: Thu May 1 10:43:04 2008 +0200
ieee1394: fix NULL pointer dereference in sysfs access
Regression since "ieee1394: prevent device binding of raw1394,
video1394, dv1394", commit d2ace29fa44589da51fedc06a67b3f05301f3bfd:
$ cat /sys/bus/ieee1394/drivers/raw1394/device_ids
triggers a NULL pointer dereference in fw_show_drv_device_ids.
Reported by Miles Lane.
Signed-off-by: Stefan Richter <stefanr@...6.in-berlin.de>
Tested-by: Miles Lane <miles.lane@...il.com>
diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c
index 70afa37..c6babe8 100644
--- a/drivers/ieee1394/nodemgr.c
+++ b/drivers/ieee1394/nodemgr.c
@@ -520,8 +520,11 @@ static ssize_t fw_show_drv_device_ids(struct device_driver *drv, char *buf)
char *scratch = buf;
driver = container_of(drv, struct hpsb_protocol_driver, driver);
+ id = driver->id_table;
+ if (!id)
+ return 0;
- for (id = driver->id_table; id->match_flags != 0; id++) {
+ for (; id->match_flags != 0; id++) {
int need_coma = 0;
if (id->match_flags & IEEE1394_MATCH_VENDOR_ID) {
--
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@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists