2008-03-08 19:42:10

by Roland McGrath

Subject: [PATCH] waitid si_code regression

In commit ee7c82da830ea860b1f9274f1f0cdf99f206e7c2, 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 <[email protected]>
Cc: Oleg Nesterov <[email protected]>
---
kernel/exit.c | 2 +-
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)

2008-03-08 20:19:43

by Oleg Nesterov

Subject: Re: [PATCH] waitid si_code regression

On 03/08, Roland McGrath wrote:
>
> In commit ee7c82da830ea860b1f9274f1f0cdf99f206e7c2, 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.
>
> 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);

Ugh, thanks.

Oleg.