Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754674AbdDDVrj (ORCPT ); Tue, 4 Apr 2017 17:47:39 -0400 Received: from mail-pg0-f42.google.com ([74.125.83.42]:36717 "EHLO mail-pg0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753656AbdDDVrh (ORCPT ); Tue, 4 Apr 2017 17:47:37 -0400 From: bsegall@google.com To: Oleg Nesterov Cc: linux-kernel@vger.kernel.org, Roland McGrath , Andrew Morton , Tejun Heo Subject: [PATCHv2] ptrace: fix PTRACE_LISTEN race corrupting task->state References: <20170224163611.GA24902@redhat.com> Date: Tue, 04 Apr 2017 14:47:34 -0700 In-Reply-To: <20170224163611.GA24902@redhat.com> (Oleg Nesterov's message of "Fri, 24 Feb 2017 17:36:11 +0100") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1770 Lines: 49 In PT_SEIZED + LISTEN mode STOP/CONT signals cause a wakeup against __TASK_TRACED. If this races with the ptrace_unfreeze_traced at the end of a PTRACE_LISTEN, this can wake the task /after/ the check against __TASK_TRACED, but before the reset of state to TASK_TRACED. This causes it to instead clobber TASK_WAKING, allowing a subsequent wakeup against TRACED while the task is still on the rq wake_list, corrupting it. Signed-off-by: Ben Segall --- v2: slight clarification in comments, put the conditional around the whole wakeup area Oleg mentioned a preference for making LISTEN unfreeze instead; I have no preference there, just wanted to make sure that this doesn't get forgotten entirely. kernel/ptrace.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/kernel/ptrace.c b/kernel/ptrace.c index 0af928712174..7cc49c3e73af 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c @@ -184,11 +184,17 @@ static void ptrace_unfreeze_traced(struct task_struct *task) WARN_ON(!task->ptrace || task->parent != current); + /* + * PTRACE_LISTEN can allow ptrace_trap_notify to wake us up + * remotely. Recheck state under the lock to close this race. + */ spin_lock_irq(&task->sighand->siglock); - if (__fatal_signal_pending(task)) - wake_up_state(task, __TASK_TRACED); - else - task->state = TASK_TRACED; + if (task->state == __TASK_TRACED) { + if (__fatal_signal_pending(task)) + wake_up_state(task, __TASK_TRACED); + else + task->state = TASK_TRACED; + } spin_unlock_irq(&task->sighand->siglock); } -- 2.12.2.715.g7642488e1d-goog