aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesper Juhl <jesper.juhl@gmail.com>2007-07-31 03:39:39 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-31 18:39:43 -0400
commitf2912a1223c0917a7b4e054f18086209137891ea (patch)
treebb5598f1c205244277ce352951bc9de1800d0df1
parentff0cfc66cd99d59e3a8024003171035e4ae192b7 (diff)
cciss: fix memory leak
There's a memory leak in the cciss driver. in alloc_cciss_hba() we may leak sizeof(ctlr_info_t) bytes if a call to alloc_disk(1 << NWD_SHIFT) fails. This patch should fix the issue. Spotted by the Coverity checker. Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com> Acked-by: Mike Miller <mike.miller@hp.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/block/cciss.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 1be82d544dc3..a11b2bd54bbe 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -3227,12 +3227,15 @@ static int alloc_cciss_hba(void)
3227 for (i = 0; i < MAX_CTLR; i++) { 3227 for (i = 0; i < MAX_CTLR; i++) {
3228 if (!hba[i]) { 3228 if (!hba[i]) {
3229 ctlr_info_t *p; 3229 ctlr_info_t *p;
3230
3230 p = kzalloc(sizeof(ctlr_info_t), GFP_KERNEL); 3231 p = kzalloc(sizeof(ctlr_info_t), GFP_KERNEL);
3231 if (!p) 3232 if (!p)
3232 goto Enomem; 3233 goto Enomem;
3233 p->gendisk[0] = alloc_disk(1 << NWD_SHIFT); 3234 p->gendisk[0] = alloc_disk(1 << NWD_SHIFT);
3234 if (!p->gendisk[0]) 3235 if (!p->gendisk[0]) {
3236 kfree(p);
3235 goto Enomem; 3237 goto Enomem;
3238 }
3236 hba[i] = p; 3239 hba[i] = p;
3237 return i; 3240 return i;
3238 } 3241 }