diff options
| author | Stephen M. Cameron <scameron@beardog.cce.hp.com> | 2010-02-05 13:14:04 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-02-23 07:37:49 -0800 |
| commit | 2b8fcd4ed0db58421d1600ff6e3b01dd68b3ef83 (patch) | |
| tree | 7156cf66998151cb1e13ac13e61f388c41fb5ec3 /drivers/block | |
| parent | e031c71282e8223cc8fc088e4c1bf86900ce9927 (diff) | |
cciss: Make cciss_seq_show handle holes in the h->drv[] array
commit 531c2dc70d339c5dfa8c3eb628c3459dc6f3a075 upstream.
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>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/block')
| -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 92b126394fa..ca9c54870f2 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c @@ -339,6 +339,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; |