From: Kees Cook <keescook@chromium.org>
Date: Thu, 6 Jun 2013 20:52:19 +0000 (-0700)
Subject: kobject: sanitize argument for format string
X-Git-Tag: v3.11-rc1~156^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b7165ebbf0898bad9aaeddfa22b918e94ed90e07;p=platform%2Fkernel%2Flinux-stable.git

kobject: sanitize argument for format string

Unlike kobject_set_name(), the kset_create_and_add() interface does not
provide a way to use format strings, so make sure that the interface
cannot be abused accidentally. It looks like all current callers use
static strings, so there's no existing flaw.

Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/lib/kobject.c b/lib/kobject.c
index b7e29a6..4a1f33d 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -805,7 +805,7 @@ static struct kset *kset_create(const char *name,
 	kset = kzalloc(sizeof(*kset), GFP_KERNEL);
 	if (!kset)
 		return NULL;
-	retval = kobject_set_name(&kset->kobj, name);
+	retval = kobject_set_name(&kset->kobj, "%s", name);
 	if (retval) {
 		kfree(kset);
 		return NULL;