From: Kees Cook <keescook@chromium.org>
Date: Thu, 6 Jun 2013 20:52:21 +0000 (-0700)
Subject: charger-manager: Ensure event is not used as format string
X-Git-Tag: v3.11-rc1~52^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3594f4c0d7bc51e3a7e6d73c44e368ae079e42f3;p=thirdparty%2Fkernel%2Flinux.git

charger-manager: Ensure event is not used as format string

The exposed interface for cm_notify_event() could result in the event msg
string being parsed as a format string. Make sure it is only used as a
literal string.

Signed-off-by: Kees Cook <keescook@chromium.org>
Cc: stable@vger.kernel.org
Cc: Anton Vorontsov <cbou@mail.ru>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Anton Vorontsov <anton@enomsg.org>
---

diff --git a/drivers/power/charger-manager.c b/drivers/power/charger-manager.c
index fefc39fe42bef..98de1ddce4586 100644
--- a/drivers/power/charger-manager.c
+++ b/drivers/power/charger-manager.c
@@ -450,7 +450,7 @@ static void uevent_notify(struct charger_manager *cm, const char *event)
 	strncpy(env_str, event, UEVENT_BUF_SIZE);
 	kobject_uevent(&cm->dev->kobj, KOBJ_CHANGE);
 
-	dev_info(cm->dev, event);
+	dev_info(cm->dev, "%s", event);
 }
 
 /**