[PATCH 1/3] kobject : kobject_set_name_vargs leak fix

From: Dave Young
Date: Mon May 11 2009 - 02:16:48 EST


kobject_set_name_vargs will leak the old_name when return -ENOMEM,
move the kfree(old_name) before the return path.

Signed-off-by: Dave Young <hidave.darkstar@xxxxxxxxx>
---
lib/kobject.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff -uprN linux.old/lib/kobject.c linux.new/lib/kobject.c
--- linux.old/lib/kobject.c 2009-05-11 13:59:01.000000000 +0800
+++ linux.new/lib/kobject.c 2009-05-11 13:59:34.000000000 +0800
@@ -221,6 +221,7 @@ int kobject_set_name_vargs(struct kobjec
if (kobj->name && !fmt)
return 0;

+ kfree(old_name);
kobj->name = kvasprintf(GFP_KERNEL, fmt, vargs);
if (!kobj->name)
return -ENOMEM;
@@ -229,7 +230,6 @@ int kobject_set_name_vargs(struct kobjec
while ((s = strchr(kobj->name, '/')))
s[0] = '!';

- kfree(old_name);
return 0;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/