diff options
| author | Stephen M. Cameron <scameron@beardog.cce.hp.com> | 2010-02-05 13:14:04 +0100 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-02-05 13:15:36 +0100 |
| commit | 531c2dc70d339c5dfa8c3eb628c3459dc6f3a075 (patch) | |
| tree | bb50efe41aa6293471ed4d5c281aff28d035bc6a | |
| parent | ae54abed636d18f7939c965f21ad126001dbe34c (diff) | |
| download | blackbird-op-linux-531c2dc70d339c5dfa8c3eb628c3459dc6f3a075.tar.gz blackbird-op-linux-531c2dc70d339c5dfa8c3eb628c3459dc6f3a075.zip | |
cciss: Make cciss_seq_show handle holes in the h->drv[] array
It is possible (and expected) for there to be holes in the h->drv[]
array, that is, some elements may be NULL pointers. cciss_seq_show
needs to be made aware of this possibility to avoid an Oops.
To reproduce the Oops which this fixes:
1) Create two "arrays" in the Array Configuratino Utility and
several logical drives on each array.
2) cat /proc/driver/cciss/cciss* in an infinite loop
3) delete some of the logical drives in the first "array."
Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Cc: stable@kernel.org
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
| -rw-r--r-- | drivers/block/cciss.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index 873e594860d3..9291614ac6b7 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c @@ -337,6 +337,9 @@ static int cciss_seq_show(struct seq_file *seq, void *v) if (*pos > h->highest_lun) return 0; + if (drv == NULL) /* it's possible for h->drv[] to have holes. */ + return 0; + if (drv->heads == 0) return 0; |
