From: Chris Wright Date: Mon, 5 Jun 2006 17:57:44 +0000 (-0700) Subject: small sbp2 fix of earlier patch named: X-Git-Tag: v2.6.16.20~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=620c34ea365a3099bee20f2908e6b6f1ef3d1628;p=thirdparty%2Fkernel%2Fstable-queue.git small sbp2 fix of earlier patch named: ohci1394, sbp2: fix "scsi_add_device failed" with PL-3507 based devices --- diff --git a/review-2.6.16/sbp2-fix-check-of-return-value-of-hpsb_allocate_and_register_addrspace.patch b/review-2.6.16/sbp2-fix-check-of-return-value-of-hpsb_allocate_and_register_addrspace.patch new file mode 100644 index 00000000000..34449356a4e --- /dev/null +++ b/review-2.6.16/sbp2-fix-check-of-return-value-of-hpsb_allocate_and_register_addrspace.patch @@ -0,0 +1,30 @@ +From stable-bounces@linux.kernel.org Fri Jun 2 17:05:37 2006 +Date: Sat, 3 Jun 2006 02:00:33 +0200 (CEST) +From: Stefan Richter +To: Linus Torvalds , stable@kernel.org +Cc: Jody McIntyre , linux1394-devel@lists.sourceforge.net, Ben Collins , linux-kernel@vger.kernel.org +Subject: sbp2: fix check of return value of hpsb_allocate_and_register_addrspace + +I added a failure check in patch "sbp2: variable status FIFO address +(fix login timeout)" --- alas for a wrong error value. This is a bug +since Linux 2.6.16. Leads to NULL pointer dereference if the call +failed, and bogus failure handling if call succeeded. + +Signed-off-by: Stefan Richter +Signed-off-by: Chris Wright +--- + + drivers/ieee1394/sbp2.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- linux-2.6.16.20.orig/drivers/ieee1394/sbp2.c ++++ linux-2.6.16.20/drivers/ieee1394/sbp2.c +@@ -764,7 +764,7 @@ static struct scsi_id_instance_data *sbp + &sbp2_highlevel, ud->ne->host, &sbp2_ops, + sizeof(struct sbp2_status_block), sizeof(quadlet_t), + 0x010000000000ULL, CSR1212_ALL_SPACE_END); +- if (!scsi_id->status_fifo_addr) { ++ if (scsi_id->status_fifo_addr == ~0ULL) { + SBP2_ERR("failed to allocate status FIFO address range"); + goto failed_alloc; + } diff --git a/review-2.6.16/series b/review-2.6.16/series index 25484023f65..8414b252be8 100644 --- a/review-2.6.16/series +++ b/review-2.6.16/series @@ -9,3 +9,4 @@ ipw2200-Filter-unsupported-channels-out-in-ad-hoc-mode.patch x86_64-add-crashdump-trigger-points.patch x86_64-don-t-do-syscall-exit-tracing-twice.patch sbp2-backport-read_capacity-workaround-for-ipod.patch +sbp2-fix-check-of-return-value-of-hpsb_allocate_and_register_addrspace.patch