2008-02-02 01:35:08

by Oliver Pinter

[permalink] [raw]

Subject: [2.6.22.y] {05/17} - cciss-fix_memory_leak - series for stable kernel #2

---

mainline: f2912a1223c0917a7b4e054f18086209137891ea

--
Thanks,
Oliver

---

Attachments:

(No filename) (71.00 B)
cciss-fix_memory_leak (1.13 kB)
Download all attachments

2008-02-06 23:12:57

by Oliver Pinter

[permalink] [raw]

Subject: Re: [2.6.22.y] {05/17} - cciss-fix_memory_leak - series for stable kernel #2

---

>From f2912a1223c0917a7b4e054f18086209137891ea Mon Sep 17 00:00:00 2001
From: Jesper Juhl <[email protected]>
Date: Tue, 31 Jul 2007 00:39:39 -0700
Subject: [PATCH] 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 <[email protected]>
Acked-by: Mike Miller <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 1be82d5..a11b2bd 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -3227,12 +3227,15 @@ static int alloc_cciss_hba(void)
for (i = 0; i < MAX_CTLR; i++) {
if (!hba[i]) {
ctlr_info_t *p;
+
p = kzalloc(sizeof(ctlr_info_t), GFP_KERNEL);
if (!p)
goto Enomem;
p->gendisk[0] = alloc_disk(1 << NWD_SHIFT);
- if (!p->gendisk[0])
+ if (!p->gendisk[0]) {
+ kfree(p);
goto Enomem;
+ }
hba[i] = p;
return i;
}


On 2/2/08, Oliver Pinter (Pint?r Oliv?r) <[email protected]> wrote:
> mainline: f2912a1223c0917a7b4e054f18086209137891ea
>
> --
> Thanks,
> Oliver
>


--
Thanks,
Oliver