]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
[PATCH] sbp2: fix check of return value of hpsb_allocate_and_register_addrspace
authorStefan Richter <stefanr@s5r6.in-berlin.de>
Sat, 3 Jun 2006 00:00:33 +0000 (02:00 +0200)
committerChris Wright <chrisw@sous-sol.org>
Mon, 5 Jun 2006 17:18:15 +0000 (10:18 -0700)
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 <stefanr@s5r6.in-berlin.de>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
drivers/ieee1394/sbp2.c

index 1787104e5174657f5032a9f00dfe7f235b8438f2..d02be4ab0112b7b14891d6c5fc0789a2e58cc825 100644 (file)
@@ -764,7 +764,7 @@ static struct scsi_id_instance_data *sbp2_alloc_device(struct unit_directory *ud
                        &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;
        }