aboutsummaryrefslogtreecommitdiff
path: root/lib/kobject.c
diff options
context:
space:
mode:
authorMaurizio Lombardi <mlombard@redhat.com>2013-11-08 15:28:25 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-12-08 18:19:15 -0800
commit020d30f17f196dcbf0c2c68a874345e8885a3149 (patch)
treeb2f0993b03c1dfaa81f14348d69aabd094286914 /lib/kobject.c
parent21d71662f895462abaa3054d504af55a306f42ba (diff)
downloadlinux-linaro-stable-020d30f17f196dcbf0c2c68a874345e8885a3149.tar.gz
kobject: fix memory leak in kobject_set_name_vargs
If the call to kvasprintf fails then the old name of the object will be leaked, this patch fixes the bug by restoring the old name before returning ENOMEM. Signed-off-by: Maurizio Lombardi <mlombard@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'lib/kobject.c')
-rw-r--r--lib/kobject.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/kobject.c b/lib/kobject.c
index 98b45bb33c8d..94b321f4ac67 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -265,8 +265,10 @@ int kobject_set_name_vargs(struct kobject *kobj, const char *fmt,
return 0;
kobj->name = kvasprintf(GFP_KERNEL, fmt, vargs);
- if (!kobj->name)
+ if (!kobj->name) {
+ kobj->name = old_name;
return -ENOMEM;
+ }
/* ewww... some of these buggers have '/' in the name ... */
while ((s = strchr(kobj->name, '/')))