From: tip-bot for Andy Lutomirski <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: tglx@linutronix.de, rostedt@goodmis.org, hpa@zytor.com,
peterz@infradead.org, bp@alien8.de, brgerst@gmail.com,
linux-kernel@vger.kernel.org, masami.hiramatsu.pt@hitachi.com,
torvalds@linux-foundation.org, luto@kernel.org, mingo@kernel.org
Subject: [tip:perf/core] perf/x86/hw_breakpoints: Improve range breakpoint validation
Date: Tue, 4 Aug 2015 01:54:35 -0700 [thread overview]
Message-ID: <tip-ab513927ab449af00cc70b0269e15ee80dd537f9@git.kernel.org> (raw)
In-Reply-To: <ae25d14d61f2f43b78e0a247e469f3072df7e201.1438312874.git.luto@kernel.org>
Commit-ID: ab513927ab449af00cc70b0269e15ee80dd537f9
Gitweb: http://git.kernel.org/tip/ab513927ab449af00cc70b0269e15ee80dd537f9
Author: Andy Lutomirski <luto@kernel.org>
AuthorDate: Thu, 30 Jul 2015 20:32:41 -0700
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 4 Aug 2015 10:16:54 +0200
perf/x86/hw_breakpoints: Improve range breakpoint validation
Range breakpoints will do the wrong thing if the address isn't
aligned. While we're there, add comments about why it's safe for
instruction breakpoints.
Signed-off-by: Andy Lutomirski <luto@kernel.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/ae25d14d61f2f43b78e0a247e469f3072df7e201.1438312874.git.luto@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/kernel/hw_breakpoint.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/arch/x86/kernel/hw_breakpoint.c b/arch/x86/kernel/hw_breakpoint.c
index 78f3e90..6f345d3 100644
--- a/arch/x86/kernel/hw_breakpoint.c
+++ b/arch/x86/kernel/hw_breakpoint.c
@@ -291,8 +291,18 @@ static int arch_build_bp_info(struct perf_event *bp)
break;
#endif
default:
+ /* AMD range breakpoint */
if (!is_power_of_2(bp->attr.bp_len))
return -EINVAL;
+ if (bp->attr.bp_addr & (bp->attr.bp_len - 1))
+ return -EINVAL;
+ /*
+ * It's impossible to use a range breakpoint to fake out
+ * user vs kernel detection because bp_len - 1 can't
+ * have the high bit set. If we ever allow range instruction
+ * breakpoints, then we'll have to check for kprobe-blacklisted
+ * addresses anywhere in the range.
+ */
if (!cpu_has_bpext)
return -EOPNOTSUPP;
info->mask = bp->attr.bp_len - 1;
next prev parent reply other threads:[~2015-08-04 8:55 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-31 3:32 [PATCH 0/3] perf: hw_breakpoint safety improvements Andy Lutomirski
2015-07-31 3:32 ` [PATCH 1/3] x86/perf/hw_breakpoint: Disallow kernel breakpoints unless kprobe-safe Andy Lutomirski
2015-08-04 8:54 ` [tip:perf/core] perf/x86/hw_breakpoints: " tip-bot for Andy Lutomirski
2015-08-04 15:51 ` [PATCH 1/3] x86/perf/hw_breakpoint: " Frederic Weisbecker
2015-08-04 23:29 ` 平松雅巳 / HIRAMATU,MASAMI
2015-09-01 10:57 ` Frederic Weisbecker
2015-09-01 11:36 ` Peter Zijlstra
2015-09-01 11:41 ` Peter Zijlstra
2015-07-31 3:32 ` [PATCH 2/3] x86/perf/hw_breakpoint: Improve range breakpoint validation Andy Lutomirski
2015-08-04 8:54 ` tip-bot for Andy Lutomirski [this message]
2015-07-31 3:32 ` [PATCH 3/3] x86/perf/hw_breakpoint: Fix check for kernelspace breakpoints Andy Lutomirski
2015-08-04 8:54 ` [tip:perf/core] perf/x86/hw_breakpoints: Fix check for kernel-space breakpoints tip-bot for Andy Lutomirski
2015-08-04 16:13 ` [PATCH 3/3] x86/perf/hw_breakpoint: Fix check for kernelspace breakpoints Frederic Weisbecker
2015-07-31 8:10 ` [PATCH 0/3] perf: hw_breakpoint safety improvements Ingo Molnar
2015-07-31 8:21 ` Peter Zijlstra
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=tip-ab513927ab449af00cc70b0269e15ee80dd537f9@git.kernel.org \
--to=tipbot@zytor.com \
--cc=bp@alien8.de \
--cc=brgerst@gmail.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=luto@kernel.org \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/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
Powered by JetHome