Skip to contentSkip to conversation

lib/kobject: save old kobject name when rename failure

PATCH RESEND New Dong Hao 1 participant 1 message Mar 19, 2013

Subsystems (2)
lore
Share & tools
lore

Dong Hao

author
#0 lore raw

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

From: Dong Hao <[email protected]>

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.

---
 lib/kobject.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
lib/kobject.c +3 -1
index f7d9f31..6e0186f 100644
@@ -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, '/')))
Signature · 1 line
1.7.9.5