From a06381fec77bf88ec6c5eb6324457cb04e9ffd69 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Sat, 23 Jun 2007 11:48:40 +0200 Subject: 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 Cc: Ingo Molnar Cc: Stable Team Signed-off-by: Linus Torvalds --- kernel/futex.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'kernel') diff --git a/kernel/futex.c b/kernel/futex.c index df248f5e083..45490bec583 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; -- cgit v1.2.3-70-g09d2