---

yaml --- r: 323603 b: refs/heads/master c: b3f68f1 h: refs/heads/master i: 323601: cae29d8 323599: 07b8f4e v: v3
git-mirror · Sep 13, 2012 · 3ac0a88 · 3ac0a88
1 parent 099402f
commit 3ac0a88
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9da33de62431c7839f98156720862262272a8380
+refs/heads/master: b3f68f16dbcde6fcdf0fd27695391ff7e9d41233
diff --git a/trunk/security/keys/keyctl.c b/trunk/security/keys/keyctl.c
@@ -1486,7 +1486,6 @@ 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;
@@ -1530,7 +1529,6 @@ long keyctl_session_to_parent(void)
 	if (!ret)
 		newwork = NULL;
 unlock:
-	task_unlock(parent);
 	write_unlock_irq(&tasklist_lock);
 	rcu_read_unlock();
 	if (oldwork)