From c8c67531fdc32b04889f8d058da5ec40f86c36c8 Mon Sep 17 00:00:00 2001
From: Eric Sesterhenn <snakebyte@gmx.de>
Date: Wed, 6 Dec 2006 20:33:47 -0800
Subject: [PATCH] --- yaml --- r: 42703 b: refs/heads/master c:
 48ad504ee7d598431cb2d0b2f01c6d1aff1d2a07 h: refs/heads/master i:   42701:
 1d327319d4c90c14b2198f8a66c9f29b538ccde7   42699:
 f1af5899b05657c384979b87dab48b06464636ce   42695:
 8495ead8eb370de90dd5d634e544a9a1e0aa4994   42687:
 bd81a692034f82601dc8e5d19769cbe3fe10b381 v: v3

---
 [refs]                        | 2 +-
 trunk/security/keys/key.c     | 4 +---
 trunk/security/keys/keyring.c | 4 +---
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index b95df46de8d7..6ef68cf442b0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7cf9c2c76c1a17b32f2da85b50cd4fe468ed44b5
+refs/heads/master: 48ad504ee7d598431cb2d0b2f01c6d1aff1d2a07
diff --git a/trunk/security/keys/key.c b/trunk/security/keys/key.c
index 0db816f10f85..ac9326c5f1da 100644
--- a/trunk/security/keys/key.c
+++ b/trunk/security/keys/key.c
@@ -290,11 +290,9 @@ struct key *key_alloc(struct key_type *type, const char *desc,
 		goto no_memory_2;
 
 	if (desc) {
-		key->description = kmalloc(desclen, GFP_KERNEL);
+		key->description = kmemdup(desc, desclen, GFP_KERNEL);
 		if (!key->description)
 			goto no_memory_3;
-
-		memcpy(key->description, desc, desclen);
 	}
 
 	atomic_set(&key->usage, 1);
diff --git a/trunk/security/keys/keyring.c b/trunk/security/keys/keyring.c
index e8d02acc51e7..ad45ce73964b 100644
--- a/trunk/security/keys/keyring.c
+++ b/trunk/security/keys/keyring.c
@@ -706,12 +706,10 @@ int __key_link(struct key *keyring, struct key *key)
 				BUG_ON(size > PAGE_SIZE);
 
 				ret = -ENOMEM;
-				nklist = kmalloc(size, GFP_KERNEL);
+				nklist = kmemdup(klist, size, GFP_KERNEL);
 				if (!nklist)
 					goto error2;
 
-				memcpy(nklist, klist, size);
-
 				/* replace matched key */
 				atomic_inc(&key->usage);
 				nklist->keys[loop] = key;