Re: [PATCH 01/14] signal: fix SIGCONT notification code

[Oleg Nesterov]

On 11/26, Tejun Heo wrote:
>
> get_signal_deliver() should test these flags and then notify
> accoringly; however, it incorrectly tested SIGNAL_STOP_CONTINUED
> instead of SIGNAL_CLD_CONTINUED,

OOPS! Yes, typo. Thanks.

This is even documented in prepare_signal(). And it always sets
SIGNAL_STOP_CONTINUED along with SIGNAL_CLD_*, we shouldn't check
this bit, of course.

> Fix it by testing SIGNAL_CLD_CONTINUED.  While at it, uncompress the
> ?: test into if/else clause for better readability.
>
> Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
> Cc: Oleg Nesterov <oleg@xxxxxxxxxx>
> Cc: Roland McGrath <roland@xxxxxxxxxx>

Reviewed-by: Oleg Nesterov <oleg@xxxxxxxxxx>

> ---
>  kernel/signal.c |    9 +++++++--
>  1 files changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/kernel/signal.c b/kernel/signal.c
> index 4e3cff1..fe004b5 100644
> --- a/kernel/signal.c
> +++ b/kernel/signal.c
> @@ -1853,8 +1853,13 @@ relock:
>  	 * the CLD_ si_code into SIGNAL_CLD_MASK bits.
>  	 */
>  	if (unlikely(signal->flags & SIGNAL_CLD_MASK)) {
> -		int why = (signal->flags & SIGNAL_STOP_CONTINUED)
> -				? CLD_CONTINUED : CLD_STOPPED;
> +		int why;
> +
> +		if (signal->flags & SIGNAL_CLD_CONTINUED)
> +			why = CLD_CONTINUED;
> +		else
> +			why = CLD_STOPPED;
> +
>  		signal->flags &= ~SIGNAL_CLD_MASK;
>  
>  		why = tracehook_notify_jctl(why, CLD_CONTINUED);
> -- 
> 1.7.1
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/