* [2.6.22.y] {05/17} - cciss-fix_memory_leak - series for stable kernel #2
@ 2008-02-02 1:33 Oliver Pinter (Pintér Olivér)
2008-02-06 23:07 ` Oliver Pinter
0 siblings, 1 reply; 2+ messages in thread
From: Oliver Pinter (Pintér Olivér) @ 2008-02-02 1:33 UTC (permalink / raw)
To: Linux Kernel, stable, stable-commits
Cc: chrisw, Greg KH, Willy Tarreau, Adrian Bunk, Jesper Juhl,
Mike Miller, Andrew Morton, Linus Torvalds
[-- Attachment #1: Type: text/plain, Size: 71 bytes --]
mainline: f2912a1223c0917a7b4e054f18086209137891ea
--
Thanks,
Oliver
[-- Attachment #2: cciss-fix_memory_leak --]
[-- Type: application/mbox, Size: 1153 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [2.6.22.y] {05/17} - cciss-fix_memory_leak - series for stable kernel #2
2008-02-02 1:33 [2.6.22.y] {05/17} - cciss-fix_memory_leak - series for stable kernel #2 Oliver Pinter (Pintér Olivér)
@ 2008-02-06 23:07 ` Oliver Pinter
0 siblings, 0 replies; 2+ messages in thread
From: Oliver Pinter @ 2008-02-06 23:07 UTC (permalink / raw)
To: Linux Kernel, stable, stable-commits
>From f2912a1223c0917a7b4e054f18086209137891ea Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jesper.juhl@gmail.com>
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 <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>
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) <oliver.pntr@gmail.com> wrote:
> mainline: f2912a1223c0917a7b4e054f18086209137891ea
>
> --
> Thanks,
> Oliver
>
--
Thanks,
Oliver
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-02-06 23:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-02-02 1:33 [2.6.22.y] {05/17} - cciss-fix_memory_leak - series for stable kernel #2 Oliver Pinter (Pintér Olivér)
2008-02-06 23:07 ` Oliver Pinter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®