---

yaml --- r: 312952 b: refs/heads/master c: d35abdb h: refs/heads/master v: v3
git-mirror · Jul 22, 2012 · 15c8f9f · 15c8f9f
1 parent 606da78
commit 15c8f9f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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)