summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorRoland McGrath <roland@redhat.com>2008-03-08 11:41:22 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-03-08 11:54:00 -0800
commit6efcae460186c0c1c94afff58a92784e1fc0d10b (patch)
treeda67b86b65e8dde1f52245e25b1889f87cc96b4e /kernel
parent84c6f6046c5a2189160a8f0dca8b90427bf690ea (diff)
downloadop-kernel-dev-6efcae460186c0c1c94afff58a92784e1fc0d10b.zip
op-kernel-dev-6efcae460186c0c1c94afff58a92784e1fc0d10b.tar.gz
Fix waitid si_code regression
In commit ee7c82da830ea860b1f9274f1f0cdf99f206e7c2 ("wait_task_stopped: simplify and fix races with SIGCONT/SIGKILL/untrace"), the magic (short) cast when storing si_code was lost in wait_task_stopped. This leaks the in-kernel CLD_* values that do not match what userland expects. Signed-off-by: Roland McGrath <roland@redhat.com> Cc: Oleg Nesterov <oleg@tv-sign.ru> 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 cd20bf0..53872bf 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -1378,7 +1378,7 @@ unlock_sig:
if (!retval && infop)
retval = put_user(0, &infop->si_errno);
if (!retval && infop)
- retval = put_user(why, &infop->si_code);
+ retval = put_user((short)why, &infop->si_code);
if (!retval && infop)
retval = put_user(exit_code, &infop->si_status);
if (!retval && infop)
OpenPOWER on IntegriCloud