[ 3.8.y.z extended stable ] Patch "charger-manager: Ensure event is not used as format string" has been added to staging queue

[Kamal Mostafa]

This is a note to let you know that I have just added a patch titled

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

to the linux-3.8.y-queue branch of the 3.8.y.z extended stable tree 
which can be found at:

 http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.8.y-queue

This patch is scheduled to be released in version 3.8.13.5.

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.8.y.z tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Kamal

------

>From 32379fa8b65c9d497ec64857f8baece042fc253b Mon Sep 17 00:00:00 2001
From: Kees Cook <keescook at chromium.org>
Date: Thu, 6 Jun 2013 13:52:21 -0700
Subject: 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 at chromium.org>
Cc: Anton Vorontsov <cbou at mail.ru>
Cc: David Woodhouse <dwmw2 at infradead.org>
Signed-off-by: Anton Vorontsov <anton at enomsg.org>
Signed-off-by: Kamal Mostafa <kamal at canonical.com>
---
 drivers/power/charger-manager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/power/charger-manager.c b/drivers/power/charger-manager.c
index 6ba047f..002df70 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);
 }

 /**
--
1.8.1.2