diff options
| author | Oleg Nesterov <[email protected]> | 2012-08-26 21:12:14 +0200 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2012-09-13 16:47:36 +0200 |
| commit | b3f68f16dbcde6fcdf0fd27695391ff7e9d41233 (patch) | |
| tree | 26833634b038b8fd9d18f109deb10770eb3f2a6e | |
| parent | 9da33de62431c7839f98156720862262272a8380 (diff) | |
task_work: Revert "hold task_lock around checks in keyctl"
This reverts commit d35abdb28824cf74f0a106a0f9c6f3ff700a35bf.
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 <[email protected]>
Signed-off-by: Oleg Nesterov <[email protected]>
Signed-off-by: Peter Zijlstra <[email protected]>
Cc: Al Viro <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Andrew Morton <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
| -rw-r--r-- | security/keys/keyctl.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c index 3364fbf46807..6cfc6478863e 100644 --- a/security/keys/keyctl.c +++ b/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) |