summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorScott James Remnant <scott@ubuntu.com>2007-11-28 16:22:07 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-11-29 09:24:55 -0800
commite6ceb32aa25fc33f21af84cc7a32fe289b3e860c (patch)
tree6a7684a5ac0f841a0bb85ce3a679e5836bd0e2df /kernel
parent14816b1e2b0eb24ef41dbe37dcb558338e54a603 (diff)
downloadlinux-e6ceb32aa25fc33f21af84cc7a32fe289b3e860c.tar.bz2
wait_task_stopped(): pass correct exit_code to wait_noreap_copyout()
In wait_task_stopped() exit_code already contains the right value for the si_status member of siginfo, and this is simply set in the non WNOWAIT case. If you call waitid() with a stopped or traced process, you'll get the signal in siginfo.si_status as expected -- however if you call waitid(WNOWAIT) at the same time, you'll get the signal << 8 | 0x7f Pass it unchanged to wait_noreap_copyout(); we would only need to shift it and add 0x7f if we were returning it in the user status field and that isn't used for any function that permits WNOWAIT. Signed-off-by: Scott James Remnant <scott@ubuntu.com> Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru> Cc: Roland McGrath <roland@redhat.com> Cc: <stable@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/exit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/exit.c b/kernel/exit.c
index 0a4a382ecf23..549c0558ba68 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -1388,7 +1388,7 @@ static int wait_task_stopped(struct task_struct *p, int delayed_group_leader,
if (unlikely(!exit_code) || unlikely(p->exit_state))
goto bail_ref;
return wait_noreap_copyout(p, pid, uid,
- why, (exit_code << 8) | 0x7f,
+ why, exit_code,
infop, ru);
}