summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2013-06-06 13:52:21 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-07-13 11:42:26 -0700
commite64c7e14f5dcb917a06fb39d5331ab88433fcaa7 (patch)
tree5ee273e2e244a022638cfb7f7fb5b23c579d0772
parent0b72ac9665b63dd029675ea601cb46defd2c974d (diff)
downloadlinux-3.10-e64c7e14f5dcb917a06fb39d5331ab88433fcaa7.tar.gz
linux-3.10-e64c7e14f5dcb917a06fb39d5331ab88433fcaa7.tar.bz2
linux-3.10-e64c7e14f5dcb917a06fb39d5331ab88433fcaa7.zip
charger-manager: Ensure event is not used as format string
commit 3594f4c0d7bc51e3a7e6d73c44e368ae079e42f3 upstream. 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: Anton Vorontsov <cbou@mail.ru> Cc: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Anton Vorontsov <anton@enomsg.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/power/charger-manager.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/charger-manager.c b/drivers/power/charger-manager.c
index fefc39fe42b..98de1ddce45 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);
}
/**