From e47ef1f8dcb441a999112d0e598863213fca3da8 Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Fri, 10 Sep 2010 09:59:46 +0100
Subject: [PATCH] --- yaml --- r: 210530 b: refs/heads/master c:
 9d1ac65a9698513d00e5608d93fca0c53f536c14 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index fbb8499873f8..e88c0c9e8695 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff3cb3fec3c5bbb5110e652bbdd410bc99a47e9f
+refs/heads/master: 9d1ac65a9698513d00e5608d93fca0c53f536c14
diff --git a/trunk/security/keys/keyctl.c b/trunk/security/keys/keyctl.c
index b2b0998d6abd..3868c6700b58 100644
--- a/trunk/security/keys/keyctl.c
+++ b/trunk/security/keys/keyctl.c
@@ -1272,6 +1272,7 @@ long keyctl_session_to_parent(void)
 	keyring_r = NULL;
 
 	me = current;
+	rcu_read_lock();
 	write_lock_irq(&tasklist_lock);
 
 	parent = me->real_parent;
@@ -1319,6 +1320,7 @@ long keyctl_session_to_parent(void)
 	set_ti_thread_flag(task_thread_info(parent), TIF_NOTIFY_RESUME);
 
 	write_unlock_irq(&tasklist_lock);
+	rcu_read_unlock();
 	if (oldcred)
 		put_cred(oldcred);
 	return 0;
@@ -1327,6 +1329,7 @@ long keyctl_session_to_parent(void)
 	ret = 0;
 not_permitted:
 	write_unlock_irq(&tasklist_lock);
+	rcu_read_unlock();
 	put_cred(cred);
 	return ret;