[PATCH] fix memory leak in UBI scanning unit

[PATCH] fix memory leak in UBI scanning unit

[Jesper Juhl]

In drivers/mtd/ubi/scan.c::paranoid_check_si() there's a memory leak.
If the call 
	err = ubi_io_is_bad(ubi, pnum);
returns <0, then we'll return with out freeing (and thus leak) buf.
This patch eliminates the memory leak by freeing buf before returning.

Problem spotted by the Coverity checker.


Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
-- 

 drivers/mtd/ubi/scan.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/ubi/scan.c b/drivers/mtd/ubi/scan.c
index 473f320..8ff9730 100644
--- a/drivers/mtd/ubi/scan.c
+++ b/drivers/mtd/ubi/scan.c
@@ -1310,9 +1310,10 @@ static int paranoid_check_si(const struct ubi_device *ubi,
 	memset(buf, 1, ubi->peb_count);
 	for (pnum = 0; pnum < ubi->peb_count; pnum++) {
 		err = ubi_io_is_bad(ubi, pnum);
-		if (err < 0)
+		if (err < 0) {
+			kfree(buf);
 			return err;
-		else if (err)
+		} else if (err)
 			buf[pnum] = 0;
 	}
 






-- 
Jesper Juhl <jesper.juhl@gmail.com>
Don't top-post  http://www.catb.org/~esr/jargon/html/T/top-post.html
Plain text mails only, please      http://www.expita.com/nomime.html

Re: [PATCH] fix memory leak in UBI scanning unit

[Artem Bityutskiy]

On Thu, 2007-05-10 at 00:26 +0200, Jesper Juhl wrote:
> In drivers/mtd/ubi/scan.c::paranoid_check_si() there's a memory leak.
> If the call 
> 	err = ubi_io_is_bad(ubi, pnum);
> returns <0, then we'll return with out freeing (and thus leak) buf.
> This patch eliminates the memory leak by freeing buf before returning.
> 
> Problem spotted by the Coverity checker.

It was already reported and fixed in our git tree. But thanks anyway.

-- 
Best regards,
Artem Bityutskiy (Битюцкий Артём)

Re: [PATCH] fix memory leak in UBI scanning unit

[Jesper Juhl]

On 10/05/07, Artem Bityutskiy <dedekind@infradead.org> wrote:
> On Thu, 2007-05-10 at 00:26 +0200, Jesper Juhl wrote:
> > In drivers/mtd/ubi/scan.c::paranoid_check_si() there's a memory leak.
> > If the call
> >       err = ubi_io_is_bad(ubi, pnum);
> > returns <0, then we'll return with out freeing (and thus leak) buf.
> > This patch eliminates the memory leak by freeing buf before returning.
> >
> > Problem spotted by the Coverity checker.
>
> It was already reported and fixed in our git tree. But thanks anyway.
>
Any idea when you'll be merging with Linus?
I just checked mainline git and the bug is still there :-(

-- 
Jesper Juhl <jesper.juhl@gmail.com>
Don't top-post  http://www.catb.org/~esr/jargon/html/T/top-post.html
Plain text mails only, please      http://www.expita.com/nomime.html

Re: [PATCH] fix memory leak in UBI scanning unit

[Artem Bityutskiy]

On Wed, 2007-06-13 at 00:21 +0200, Jesper Juhl wrote:
> Any idea when you'll be merging with Linus?
> I just checked mainline git and the bug is still there :-(

This bug is in debugging code and is nearly impossible to hit,
so it will be merged during the next merge window.

-- 
Best regards,
Artem Bityutskiy (Битюцкий Артём)