Re: [ 020/184] ptrace: ensure arch_ptrace/ptrace_request can never

[Oleg Nesterov]

On 06/05, Luis Henriques wrote:
>
> Willy Tarreau <w@xxxxxx> writes:
>
> > 2.6.32-longterm review patch.  If anyone has any objections, please let me know.
> >
> > ------------------
> >  race with SIGKILL
> >
> > From: Oleg Nesterov <oleg@xxxxxxxxxx>
> >
> > ptrace: ensure arch_ptrace/ptrace_request can never race with SIGKILL
> >
>
> This patch actually introduce a regression in the Ubuntu kernel.  You
> may want to include the fix below.

Yes, 2.6.32 should also take care of TASK_STOPPED.

> --- a/kernel/ptrace.c
> +++ b/kernel/ptrace.c
> @@ -81,14 +81,18 @@ void __ptrace_unlink(struct task_struct *child)
>  }
>  
>  /* Ensure that nothing can wake it up, even SIGKILL */
> -static bool ptrace_freeze_traced(struct task_struct *task)
> +static bool ptrace_freeze_traced(struct task_struct *task, int kill)
>  {
> -	bool ret = false;
> +	bool ret = true;
>  
>  	spin_lock_irq(&task->sighand->siglock);
> -	if (task_is_traced(task) && !__fatal_signal_pending(task)) {
> +	if (task_is_stopped(task) && !__fatal_signal_pending(task))
>  		task->state = __TASK_TRACED;
> -		ret = true;
> +	else if (!kill) {
> +		if (task_is_traced(task) && !__fatal_signal_pending(task))
> +			task->state = __TASK_TRACED;
> +		else
> +			ret = false;
>  	}
>  	spin_unlock_irq(&task->sighand->siglock);
>  
> @@ -131,7 +135,7 @@ int ptrace_check_attach(struct task_struct *child, int kill)
>  		 * child->sighand can't be NULL, release_task()
>  		 * does ptrace_unlink() before __exit_signal().
>  		 */
> -		if (kill || ptrace_freeze_traced(child))
> +		if (ptrace_freeze_traced(child, kill))
>  			ret = 0;

I can't apply this patch, probably I misread it...

But it looks very wrong. It seems that ptrace_freeze_traced(kill => true)
always succeeds? Even if task is TASK_RUNNING/UNINTERRUPTIBLE/etc ?

Note: I can make a _much_ simpler patch for 2.6.32, please let me know
if you need it.

We can rely on sys_ptrace()->lock_kernel() and simply do lock/unlock
if fatal_signal_pending() in ptrace_stop/do_signal_stop. This is not
the same, this doesn't prevent wakeup(), but this should be enough.

Oleg.

--
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/