From 15b7d0896e68a8eed53694deaac97d0e7e0d79df Mon Sep 17 00:00:00 2001
From: James Morris <jmorris@namei.org>
Date: Mon, 5 Jan 2009 08:56:01 +1100
Subject: [PATCH] --- yaml --- r: 126829 b: refs/heads/master c:
 5c8c40be4b5a2944483bfc1a45d6c3fa02551af3 h: refs/heads/master i:   126827:
 bc45155eb7b307b7aa7d05ca66504424f237cb79 v: v3

---
 [refs]                       | 2 +-
 trunk/security/keys/keyctl.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 644a309edb0e..15546f2ee7d1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d3dc07cbb1e88deed2e8710e215f232a56b1dce
+refs/heads/master: 5c8c40be4b5a2944483bfc1a45d6c3fa02551af3
diff --git a/trunk/security/keys/keyctl.c b/trunk/security/keys/keyctl.c
index 6688765bd8b9..09796797d122 100644
--- a/trunk/security/keys/keyctl.c
+++ b/trunk/security/keys/keyctl.c
@@ -1294,7 +1294,7 @@ asmlinkage long sys_keyctl(int option, unsigned long arg2, unsigned long arg3,
 
 	case KEYCTL_GET_SECURITY:
 		return keyctl_get_security((key_serial_t) arg2,
-					   (char *) arg3,
+					   (char __user *) arg3,
 					   (size_t) arg4);
 
 	default: