From a67d3c377220edbbfc27963e7f82bb7ab8b60150 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 17 Jan 2009 14:28:23 -0800
Subject: [PATCH] --- yaml --- r: 129899 b: refs/heads/master c:
 0bac038a9eec00ac27f95ca0360954c0016fd859 h: refs/heads/master i:   129897:
 47e3a230cb3accf7c60f7c0da6f8cf1e75b6ea4f   129895:
 4e9521f996cfff033f854fe4efdfff8e583b1c4b v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/firmware/dell_rbu.c | 4 ++--
 trunk/security/keys/keyctl.c      | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5a32fe2fabb7..e9d68d1e1f43 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5dbdf7354821e00e4419ac3520d05d126857d56e
+refs/heads/master: 0bac038a9eec00ac27f95ca0360954c0016fd859
diff --git a/trunk/drivers/firmware/dell_rbu.c b/trunk/drivers/firmware/dell_rbu.c
index 13946ebd77d6..b4704e150b28 100644
--- a/trunk/drivers/firmware/dell_rbu.c
+++ b/trunk/drivers/firmware/dell_rbu.c
@@ -576,7 +576,7 @@ static ssize_t read_rbu_image_type(struct kobject *kobj,
 {
 	int size = 0;
 	if (!pos)
-		size = sprintf(buffer, "%s\n", image_type);
+		size = scnprintf(buffer, count, "%s\n", image_type);
 	return size;
 }
 
@@ -648,7 +648,7 @@ static ssize_t read_rbu_packet_size(struct kobject *kobj,
 	int size = 0;
 	if (!pos) {
 		spin_lock(&rbu_data.lock);
-		size = sprintf(buffer, "%lu\n", rbu_data.packetsize);
+		size = scnprintf(buffer, count, "%lu\n", rbu_data.packetsize);
 		spin_unlock(&rbu_data.lock);
 	}
 	return size;
diff --git a/trunk/security/keys/keyctl.c b/trunk/security/keys/keyctl.c
index e9335e1c6cf5..b1ec3b4ee17d 100644
--- a/trunk/security/keys/keyctl.c
+++ b/trunk/security/keys/keyctl.c
@@ -270,6 +270,7 @@ long keyctl_join_session_keyring(const char __user *_name)
 
 	/* join the session */
 	ret = join_session_keyring(name);
+	kfree(name);
 
  error:
 	return ret;