diff options
| author | Scott James Remnant <scott@ubuntu.com> | 2007-11-28 16:22:07 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-12-14 09:51:00 -0800 |
| commit | f2df5ee1b37017bb7a14ef2b512fd695197782f7 (patch) | |
| tree | fc3c1b873c8d14e97063f3d0ca7172eef8bfa841 | |
| parent | fc175adc1c935ea8679d76a78d7a58df34af16eb (diff) | |
wait_task_stopped(): pass correct exit_code to wait_noreap_copyout()
patch e6ceb32aa25fc33f21af84cc7a32fe289b3e860c in mainline.
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>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | kernel/exit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index 096c27da7bd..b5fee81c90d 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -1365,7 +1365,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); } |