FUTEX: Restore the dropped ERSCH fix

a06381fe · Thomas Gleixner <[email protected]> · 2007-06-23 11:48:40 +02:00

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 <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Stable Team <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

Commit: a06381fec77bf88ec6c5eb6324457cb04e9ffd69
Parents: b2510b16

Changes

1 files changed · +6 −8

File	Status	Add	Del	Content
kernel/futex.c	modified	+6	−8	View file

kernel/futex.c

View file

diff --git a/kernel/futex.c b/kernel/futex.c
index df248f5..45490be 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;