Messages in this thread Patch in this message | | | Date | Wed, 12 Dec 2007 22:52:40 -0800 | From | Greg KH <> | Subject | [patch 32/60] wait_task_stopped(): pass correct exit_code to wait_noreap_copyout() |
| |
2.6.23-stable review patch. If anyone has any objections, please let us know.
------------------ From: Scott James Remnant <scott@ubuntu.com>
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>
--- kernel/exit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/kernel/exit.c +++ b/kernel/exit.c @@ -1365,7 +1365,7 @@ static int wait_task_stopped(struct task 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); } --
| |