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

[Dong Hao]

From: Hao Dong <haodong@xxxxxxxxxxxxxxxxxx>

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

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

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

diff --git a/lib/kobject.c b/lib/kobject.c
index e07ee1f..c6e201a 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

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