cciss: fix cciss_revalidate panic
authorStephen M. Cameron <scameron@beardog.cce.hp.com>
Fri, 17 Dec 2010 08:01:37 +0000 (09:01 +0100)
committerJens Axboe <jaxboe@fusionio.com>
Fri, 17 Dec 2010 08:01:37 +0000 (09:01 +0100)
If you delete a logical drive, and then run BLKRRPART (e.g. via fdisk)
on a logical drive which is "after" the deleted logical drive in the h->drv[]
array, then cciss_revalidate panics because it will access the null pointer
h->drv[x] when x hits the deleted drive.

Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Cc: stable@kernel.org
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
drivers/block/cciss.c

index f291587d753e1b49ceb6138af1b925801b47a4db..233e06c29ff4fa6765ca417dd707cf8b94102dda 100644 (file)
@@ -2834,6 +2834,8 @@ static int cciss_revalidate(struct gendisk *disk)
        InquiryData_struct *inq_buff = NULL;
 
        for (logvol = 0; logvol < CISS_MAX_LUN; logvol++) {
+               if (!h->drv[logvol])
+                       continue
                if (memcmp(h->drv[logvol]->LunID, drv->LunID,
                        sizeof(drv->LunID)) == 0) {
                        FOUND = 1;