Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6af9df7f authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Linus Torvalds
Browse files

ptrace/arm: revert "hw_breakpoints: Fix racy access to ptrace breakpoints" 



This reverts commit bf0b8f4b ("hw_breakpoints: Fix racy access to
ptrace breakpoints").

The patch was fine but we can no longer race with SIGKILL after commit
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: default avatarOleg Nesterov <oleg@redhat.com>
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jan Kratochvil <jan.kratochvil@redhat.com>
Cc: Michael Neuling <mikey@neuling.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Prasad <prasad@linux.vnet.ibm.com>
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6961ed96

arch/arm/kernel/ptrace.c

+0 −8
Original line number Diff line number Diff line
@@ -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