Skip to content

Commit

Permalink
mtd: fix memory leak in block2mtd_setup()
Browse files Browse the repository at this point in the history
There's a mem leak in drivers/mtd/devices/block2mtd.c::block2mtd_setup()

We can leak 'name' allocated with kmalloc in 'parse_name' if leave via
the 'parse_err' macro since it contains a return but doesn't do any
freeing.

Spotted by coverity checker as bug 615.

Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
  • Loading branch information
Jesper Juhl authored and David Woodhouse committed May 14, 2006
1 parent 552d920 commit a6550e5
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions drivers/mtd/devices/block2mtd.c
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,8 @@ static inline void kill_final_newline(char *str)

static int block2mtd_setup(const char *val, struct kernel_param *kp)
{
char buf[80+12], *str=buf; /* 80 for device, 12 for erase size */
char buf[80+12]; /* 80 for device, 12 for erase size */
char *str = buf;
char *token[2];
char *name;
size_t erase_size = PAGE_SIZE;
Expand All @@ -441,7 +442,7 @@ static int block2mtd_setup(const char *val, struct kernel_param *kp)
strcpy(str, val);
kill_final_newline(str);

for (i=0; i<2; i++)
for (i = 0; i < 2; i++)
token[i] = strsep(&str, ",");

if (str)
Expand All @@ -460,8 +461,10 @@ static int block2mtd_setup(const char *val, struct kernel_param *kp)

if (token[1]) {
ret = parse_num(&erase_size, token[1]);
if (ret)
if (ret) {
kfree(name);
parse_err("illegal erase size");
}
}

add_device(name, erase_size);
Expand Down

0 comments on commit a6550e5

Please sign in to comment.