From 15c8f9f50450adf869e695fe945f8343a8df828c Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sat, 30 Jun 2012 11:55:24 +0400 Subject: [PATCH] --- yaml --- r: 312952 b: refs/heads/master c: d35abdb28824cf74f0a106a0f9c6f3ff700a35bf h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/security/keys/keyctl.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f76ec3fcd7f3..f368ed782cc7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6120d3dbb1220792ebea88cd475e1ec8f8620a93 +refs/heads/master: d35abdb28824cf74f0a106a0f9c6f3ff700a35bf diff --git a/trunk/security/keys/keyctl.c b/trunk/security/keys/keyctl.c index 0291b3f9397c..f1b59ae39d7e 100644 --- a/trunk/security/keys/keyctl.c +++ b/trunk/security/keys/keyctl.c @@ -1486,6 +1486,7 @@ long keyctl_session_to_parent(void) oldwork = NULL; parent = me->real_parent; + task_lock(parent); /* the parent mustn't be init and mustn't be a kernel thread */ if (parent->pid <= 1 || !parent->mm) goto unlock; @@ -1529,6 +1530,7 @@ long keyctl_session_to_parent(void) if (!ret) newwork = NULL; unlock: + task_unlock(parent); write_unlock_irq(&tasklist_lock); rcu_read_unlock(); if (oldwork)