Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3f68f16 authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Ingo Molnar
Browse files

task_work: Revert "hold task_lock around checks in keyctl" 



This reverts commit d35abdb2.

task_lock() was added to ensure exit_mm() and thus exit_task_work() is
not possible before task_work_add().

This is wrong, task_lock() must not be nested with write_lock(tasklist).
And this is no longer needed, task_work_add() now fails if it is called
after exit_task_work().

Reported-by: default avatarDave Jones <davej@redhat.com>
Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Link: http://lkml.kernel.org/r/20120826191214.GA4231@redhat.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 9da33de6

security/keys/keyctl.c

+0 −2
Original line number Diff line number Diff line
@@ -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)