]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
FUTEX: Restore the dropped ERSCH fix
authorThomas Gleixner <tglx@linutronix.de>
Sat, 23 Jun 2007 09:48:40 +0000 (11:48 +0200)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 24 Jun 2007 19:08:53 +0000 (12:08 -0700)
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>
kernel/futex.c

index df248f5e0836c708ce1eca1bdb1090524370b3d1..45490bec5831d5a806c1703251f82dec3e599d63 100644 (file)
@@ -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;