]> git.karo-electronics.de Git - linux-beck.git/commitdiff
mtd: fix memory leaks in phram_setup
authorJesper Juhl <jesper.juhl@gmail.com>
Sat, 13 May 2006 23:07:18 +0000 (01:07 +0200)
committerDavid Woodhouse <dwmw2@infradead.org>
Sat, 13 May 2006 23:13:30 +0000 (00:13 +0100)
There are two code paths in drivers/mtd/devices/phram.c::phram_setup() that
will leak memory.
Memory is allocated to the variable 'name' with kmalloc() by the
parse_name() function, but if we leave by way of the parse_err() macro,
then that memory is never kfree()'d, nor is it ever used with
register_device() so it won't be freed later either - leak.

Found by the Coverity checker as #593 - simple fix below.

Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
drivers/mtd/devices/phram.c

index 41af9693d880b9ca2947806b2626258cfd6feb1f..68d39cc9df71f368e63dca3b2b50f33a29275c25 100644 (file)
@@ -266,12 +266,16 @@ static int phram_setup(const char *val, struct kernel_param *kp)
                return 0;
 
        ret = parse_num32(&start, token[1]);
-       if (ret)
+       if (ret) {
+               kfree(name);
                parse_err("illegal start address\n");
+       }
 
        ret = parse_num32(&len, token[2]);
-       if (ret)
+       if (ret) {
+               kfree(name);
                parse_err("illegal device length\n");
+       }
 
        register_device(name, start, len);