[PATCH][RESEND] lib/kobject: save old kobject name when rename failure

[PATCH][RESEND] lib/kobject: save old kobject name when rename failure

[Dong Hao]

From: Dong Hao <haodong@linux.vnet.ibm.com>

Function kobject_set_name_vargs() was implemented to rename the existing kobject.
It depends on kvasprintf() which might return NULL, so it's possible that kobject name
becomes NULL and in that case we will lose the old name.

This patch restores the old name when kvasprintf() returns NULL.

Signed-off-by: Dong Hao <haodong@linux.vnet.ibm.com>
---
 lib/kobject.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/kobject.c b/lib/kobject.c
index f7d9f31..6e0186f 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -220,8 +220,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, '/')))
-- 
1.7.9.5