Skip to content

Commit

Permalink
FUTEX: Restore the dropped ERSCH fix
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Thomas Gleixner authored and Linus Torvalds committed Jun 24, 2007
1 parent b2510b1 commit a06381f
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions kernel/futex.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit a06381f

Please sign in to comment.