diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2007-06-23 11:48:40 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-24 12:08:53 -0700 |
| commit | a06381fec77bf88ec6c5eb6324457cb04e9ffd69 (patch) | |
| tree | 0762df31cf5e20cc52705cf7960b065922eeb1f3 /kernel/futex.c | |
| parent | b2510b1696730307e7a388ea04132236ab45ac20 (diff) | |
| download | lwn-a06381fec77bf88ec6c5eb6324457cb04e9ffd69.tar.gz lwn-a06381fec77bf88ec6c5eb6324457cb04e9ffd69.zip | |
FUTEX: Restore the dropped ERSCH fix
The return value of futex_find_get_task() needs to be -ESRCH in case
that the search fails. This was part of the original futex fixes and
got accidentally dropped, when the futex-tidy-up patch was split out.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Stable Team <stable@kernel.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/futex.c')
| -rw-r--r-- | kernel/futex.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index df248f5e0836..45490bec5831 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -409,14 +409,12 @@ static struct task_struct * futex_find_get_task(pid_t pid) rcu_read_lock(); p = find_task_by_pid(pid); - if (!p) - goto out_unlock; - if ((current->euid != p->euid) && (current->euid != p->uid)) { - p = NULL; - goto out_unlock; - } - get_task_struct(p); -out_unlock: + + if (!p || ((current->euid != p->euid) && (current->euid != p->uid))) + p = ERR_PTR(-ESRCH); + else + get_task_struct(p); + rcu_read_unlock(); return p; |