From: Oleg Nesterov <oleg@redhat.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Frederic Weisbecker <fweisbec@gmail.com>,
Ingo Molnar <mingo@elte.hu>,
Jan Kratochvil <jan.kratochvil@redhat.com>,
Michael Neuling <mikey@neuling.org>,
Paul Mackerras <paulus@samba.org>,
Paul Mundt <lethal@linux-sh.org>,
Prasad <prasad@linux.vnet.ibm.com>,
Russell King <linux@arm.linux.org.uk>,
Will Deacon <will.deacon@arm.com>,
linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 11/13] ptrace: PTRACE_DETACH should do flush_ptrace_hw_breakpoint(child)
Date: Mon, 13 May 2013 17:17:37 +0200 [thread overview]
Message-ID: <20130513151737.GA6297@redhat.com> (raw)
In-Reply-To: <20130513151631.GA6215@redhat.com>
Change ptrace_detach() to call flush_ptrace_hw_breakpoint(child).
This frees the slots for non-ptrace PERF_TYPE_BREAKPOINT users, and
this ensures that the tracee won't be killed by SIGTRAP triggered by
the active breakpoints.
Test-case:
unsigned long encode_dr7(int drnum, int enable, unsigned int type, unsigned int len)
{
unsigned long dr7;
dr7 = ((len | type) & 0xf)
<< (DR_CONTROL_SHIFT + drnum * DR_CONTROL_SIZE);
if (enable)
dr7 |= (DR_GLOBAL_ENABLE << (drnum * DR_ENABLE_SIZE));
return dr7;
}
int write_dr(int pid, int dr, unsigned long val)
{
return ptrace(PTRACE_POKEUSER, pid,
offsetof (struct user, u_debugreg[dr]),
val);
}
void func(void)
{
}
int main(void)
{
int pid, stat;
unsigned long dr7;
pid = fork();
if (!pid) {
assert(ptrace(PTRACE_TRACEME, 0,0,0) == 0);
kill(getpid(), SIGHUP);
func();
return 0x13;
}
assert(pid == waitpid(-1, &stat, 0));
assert(WSTOPSIG(stat) == SIGHUP);
assert(write_dr(pid, 0, (long)func) == 0);
dr7 = encode_dr7(0, 1, DR_RW_EXECUTE, DR_LEN_1);
assert(write_dr(pid, 7, dr7) == 0);
assert(ptrace(PTRACE_DETACH, pid, 0,0) == 0);
assert(pid == waitpid(-1, &stat, 0));
assert(stat == 0x1300);
return 0;
}
Before this patch the child is killed after PTRACE_DETACH.
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
---
kernel/ptrace.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index 8cc170b..0ea7f22 100644
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -469,6 +469,7 @@ static int ptrace_detach(struct task_struct *child, unsigned int data)
/* Architecture-specific hardware disable .. */
ptrace_disable(child);
clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
+ flush_ptrace_hw_breakpoint(child);
write_lock_irq(&tasklist_lock);
/*
--
1.5.5.1
next prev parent reply other threads:[~2013-05-13 15:21 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-13 15:16 [PATCH 0/13] ptrace/hw_breakpoint cleanups/fixes Oleg Nesterov
2013-05-13 15:16 ` Oleg Nesterov
2013-05-13 15:16 ` [PATCH 01/13] ptrace/x86: Revert "hw_breakpoints: Fix racy access to ptrace breakpoints" Oleg Nesterov
2013-05-13 15:16 ` Oleg Nesterov
2013-05-13 15:17 ` [PATCH 02/13] ptrace/powerpc: " Oleg Nesterov
2013-05-13 15:17 ` Oleg Nesterov
2013-05-13 15:17 ` [PATCH 03/13] ptrace/arm: " Oleg Nesterov
2013-05-13 15:17 ` Oleg Nesterov
2013-05-13 15:17 ` [PATCH 04/13] ptrace/sh: " Oleg Nesterov
2013-05-13 15:17 ` [PATCH 05/13] ptrace: Revert "Prepare to fix racy accesses on task breakpoints" Oleg Nesterov
2013-05-13 15:17 ` Oleg Nesterov
2013-05-13 15:17 ` [PATCH 06/13] ptrace/x86: simplify the "disable" logic in ptrace_write_dr7() Oleg Nesterov
2013-05-13 15:17 ` Oleg Nesterov
2013-05-13 15:17 ` [PATCH 07/13] ptrace/x86: dont delay "disable" till second pass " Oleg Nesterov
2013-05-13 15:17 ` Oleg Nesterov
2013-05-13 15:17 ` [PATCH 08/13] ptrace/x86: introduce ptrace_register_breakpoint() Oleg Nesterov
2013-05-13 15:17 ` Oleg Nesterov
2013-05-13 15:17 ` [PATCH 09/13] ptrace/x86: ptrace_write_dr7() should create bp if !disabled Oleg Nesterov
2013-05-13 15:17 ` Oleg Nesterov
2013-05-13 15:17 ` [PATCH 10/13] ptrace/x86: cleanup ptrace_set_debugreg() Oleg Nesterov
2013-05-13 15:17 ` Oleg Nesterov
2013-05-13 15:17 ` Oleg Nesterov [this message]
2013-08-05 4:16 ` [PATCH 11/13] ptrace: PTRACE_DETACH should do flush_ptrace_hw_breakpoint(child) Felipe Contreras
2013-05-13 15:17 ` [PATCH 12/13] ptrace/x86: flush_ptrace_hw_breakpoint() shoule clear the virtual debug registers Oleg Nesterov
2013-05-13 15:17 ` [PATCH 13/13] x86: kill TIF_DEBUG Oleg Nesterov
2013-05-13 15:17 ` Oleg Nesterov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130513151737.GA6297@redhat.com \
--to=oleg@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=benh@kernel.crashing.org \
--cc=fweisbec@gmail.com \
--cc=jan.kratochvil@redhat.com \
--cc=lethal@linux-sh.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=mikey@neuling.org \
--cc=mingo@elte.hu \
--cc=paulus@samba.org \
--cc=prasad@linux.vnet.ibm.com \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).