From: Maurizio Lombardi <mlombard@redhat.com>
Date: Fri, 8 Nov 2013 14:28:25 +0000 (+0100)
Subject: kobject: fix memory leak in kobject_set_name_vargs
X-Git-Tag: v3.14-rc1~151^2~67
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=020d30f17f196dcbf0c2c68a874345e8885a3149;p=kernel%2Fkernel-generic.git

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>
---

diff --git a/lib/kobject.c b/lib/kobject.c
index 98b45bb..94b321f 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, '/')))