From mboxrd@z Thu Jan 1 00:00:00 1970 From: Oleg Nesterov Subject: [PATCH 03/13] ptrace/arm: Revert "hw_breakpoints: Fix racy access to ptrace breakpoints" Date: Mon, 13 May 2013 17:17:06 +0200 Message-ID: <20130513151706.GA6249@redhat.com> References: <20130513151631.GA6215@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <20130513151631.GA6215@redhat.com> Sender: linux-kernel-owner@vger.kernel.org To: Andrew Morton Cc: Benjamin Herrenschmidt , Frederic Weisbecker , Ingo Molnar , Jan Kratochvil , Michael Neuling , Paul Mackerras , Paul Mundt , Prasad , Russell King , Will Deacon , linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org List-Id: linux-arch.vger.kernel.org This reverts commit bf0b8f4b55e591ba417c2dbaff42769e1fc773b0. The patch was fine but we can no longer race with SIGKILL after 9899d11f "ptrace: ensure arch_ptrace/ptrace_request can never race with SIGKILL", the __TASK_TRACED tracee can't be woken up and ->ptrace_bps[] can't go away. Signed-off-by: Oleg Nesterov Acked-by: Will Deacon --- arch/arm/kernel/ptrace.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c index 03deeff..41668e5 100644 --- a/arch/arm/kernel/ptrace.c +++ b/arch/arm/kernel/ptrace.c @@ -886,20 +886,12 @@ long arch_ptrace(struct task_struct *child, long request, #ifdef CONFIG_HAVE_HW_BREAKPOINT case PTRACE_GETHBPREGS: - if (ptrace_get_breakpoints(child) < 0) - return -ESRCH; - ret = ptrace_gethbpregs(child, addr, (unsigned long __user *)data); - ptrace_put_breakpoints(child); break; case PTRACE_SETHBPREGS: - if (ptrace_get_breakpoints(child) < 0) - return -ESRCH; - ret = ptrace_sethbpregs(child, addr, (unsigned long __user *)data); - ptrace_put_breakpoints(child); break; #endif -- 1.5.5.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com ([209.132.183.28]:37521 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752684Ab3EMPVF (ORCPT ); Mon, 13 May 2013 11:21:05 -0400 Date: Mon, 13 May 2013 17:17:06 +0200 From: Oleg Nesterov Subject: [PATCH 03/13] ptrace/arm: Revert "hw_breakpoints: Fix racy access to ptrace breakpoints" Message-ID: <20130513151706.GA6249@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20130513151631.GA6215@redhat.com> Sender: linux-arch-owner@vger.kernel.org List-ID: To: Andrew Morton Cc: Benjamin Herrenschmidt , Frederic Weisbecker , Ingo Molnar , Jan Kratochvil , Michael Neuling , Paul Mackerras , Paul Mundt , Prasad , Russell King , Will Deacon , linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Message-ID: <20130513151706.3wtwlfWMAN5oN7L92LpouwULiHbIOQPKyBRoYgiem6c@z> This reverts commit bf0b8f4b55e591ba417c2dbaff42769e1fc773b0. The patch was fine but we can no longer race with SIGKILL after 9899d11f "ptrace: ensure arch_ptrace/ptrace_request can never race with SIGKILL", the __TASK_TRACED tracee can't be woken up and ->ptrace_bps[] can't go away. Signed-off-by: Oleg Nesterov Acked-by: Will Deacon --- arch/arm/kernel/ptrace.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c index 03deeff..41668e5 100644 --- a/arch/arm/kernel/ptrace.c +++ b/arch/arm/kernel/ptrace.c @@ -886,20 +886,12 @@ long arch_ptrace(struct task_struct *child, long request, #ifdef CONFIG_HAVE_HW_BREAKPOINT case PTRACE_GETHBPREGS: - if (ptrace_get_breakpoints(child) < 0) - return -ESRCH; - ret = ptrace_gethbpregs(child, addr, (unsigned long __user *)data); - ptrace_put_breakpoints(child); break; case PTRACE_SETHBPREGS: - if (ptrace_get_breakpoints(child) < 0) - return -ESRCH; - ret = ptrace_sethbpregs(child, addr, (unsigned long __user *)data); - ptrace_put_breakpoints(child); break; #endif -- 1.5.5.1