diff options
| author | Stephen M. Cameron <scameron@beardog.cce.hp.com> | 2009-09-17 13:47:50 -0500 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-10-01 21:15:43 +0200 |
| commit | 2c935593ac1871211b43a54f023dc3bc605ad346 (patch) | |
| tree | 7ce33ec7a0f1bb7386a347ed1e31c7f2513ed5c2 /drivers/block | |
| parent | 2d11d9931f5968bddac50d9d224c4812d4be869a (diff) | |
| download | linux-2c935593ac1871211b43a54f023dc3bc605ad346.tar.bz2 | |
cciss: Fix excessive gendisk freeing bug on driver unload.
Fix bug that free_hba was calling put_disk for all gendisk[]
pointers -- all 1024 of them -- regardless of whether the were
used or not (NULL). This bug could cause rmmod to oops if logical
drives had been deleted during the driver's lifetime.
Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/cciss.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index 0a3c057c7785..3a6ca7de4c93 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c @@ -3893,15 +3893,16 @@ Enomem: return -1; } -static void free_hba(int i) +static void free_hba(int n) { - ctlr_info_t *p = hba[i]; - int n; + ctlr_info_t *h = hba[n]; + int i; - hba[i] = NULL; - for (n = 0; n < CISS_MAX_LUN; n++) - put_disk(p->gendisk[n]); - kfree(p); + hba[n] = NULL; + for (i = 0; i < h->highest_lun + 1; i++) + if (h->gendisk[i] != NULL) + put_disk(h->gendisk[i]); + kfree(h); } /* Send a message CDB to the firmware. */ |