From 8ca15cddcc8f2bf4a83519da751b03670746383a Mon Sep 17 00:00:00 2001
From: Thomas Meyer <thomas@m3y3r.de>
Date: Thu, 17 Nov 2011 12:43:40 +0000
Subject: [PATCH] --- yaml --- r: 277911 b: refs/heads/master c:
 65d9d2cac5ee2a33b0cec7044171f67d290e7d6e h: refs/heads/master i:   277909:
 929dd288c3f600dd44050ef07ea25a06dedf71a1   277907:
 bfd26e8a75f685c517f705d843843925f64975cd   277903:
 2f9dae9c639652e87712b9ac40e2027c313cc9f1 v: v3

---
 [refs]                   | 2 +-
 trunk/net/rxrpc/ar-key.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 188cd213b56f..84a6b4c39dd8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb508701efa01ba8628ff2d4280dbbb713d62955
+refs/heads/master: 65d9d2cac5ee2a33b0cec7044171f67d290e7d6e
diff --git a/trunk/net/rxrpc/ar-key.c b/trunk/net/rxrpc/ar-key.c
index 43ea7de2fc8e..4cba13e46ffd 100644
--- a/trunk/net/rxrpc/ar-key.c
+++ b/trunk/net/rxrpc/ar-key.c
@@ -306,10 +306,9 @@ static int rxrpc_krb5_decode_tagged_data(struct krb5_tagged_data *td,
 	td->data_len = len;
 
 	if (len > 0) {
-		td->data = kmalloc(len, GFP_KERNEL);
+		td->data = kmemdup(xdr, len, GFP_KERNEL);
 		if (!td->data)
 			return -ENOMEM;
-		memcpy(td->data, xdr, len);
 		len = (len + 3) & ~3;
 		toklen -= len;
 		xdr += len >> 2;
@@ -401,10 +400,9 @@ static int rxrpc_krb5_decode_ticket(u8 **_ticket, u16 *_tktlen,
 	_debug("ticket len %u", len);
 
 	if (len > 0) {
-		*_ticket = kmalloc(len, GFP_KERNEL);
+		*_ticket = kmemdup(xdr, len, GFP_KERNEL);
 		if (!*_ticket)
 			return -ENOMEM;
-		memcpy(*_ticket, xdr, len);
 		len = (len + 3) & ~3;
 		toklen -= len;
 		xdr += len >> 2;