Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

task_work: Revert "hold task_lock around checks in keyctl"

Browse source 
This reverts commit d35abdb288.

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: Dave Jones <davej@redhat.com>
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Peter 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: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Oleg Nesterov 2012-08-26 21:12:14 +02:00 committed by Ingo Molnar
parent 9da33de624
commit b3f68f16db
1 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
security/keys/keyctl.c
View file

@ -1486,7 +1486,6 @@ long keyctl_session_to_parent(void)
oldwork = NULL; oldwork = NULL;
parent = me->real_parent; parent = me->real_parent;
task_lock(parent);
/* the parent mustn't be init and mustn't be a kernel thread */ /* the parent mustn't be init and mustn't be a kernel thread */
if (parent->pid <= 1 || !parent->mm) if (parent->pid <= 1 || !parent->mm)
goto unlock; goto unlock;
@ -1530,7 +1529,6 @@ long keyctl_session_to_parent(void)
if (!ret) if (!ret)
newwork = NULL; newwork = NULL;
unlock: unlock:
task_unlock(parent);
write_unlock_irq(&tasklist_lock); write_unlock_irq(&tasklist_lock);
rcu_read_unlock(); rcu_read_unlock();
if (oldwork) if (oldwork)