From: Masami Hiramatsu <mhiramat@kernel.org>
To: Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will.deacon@arm.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>,
Pratyush Anand <panand@redhat.com>,
"David A . Long" <dave.long@linaro.org>,
linux-arm-kernel@lists.infradead.org,
linux-kernel <linux-kernel@vger.kernel.org>
Subject: [PATCH 1/3] arm64: kprobes: Move extable address check into arch_prepare_kprobe()
Date: Mon, 17 Dec 2018 15:40:46 +0900 [thread overview]
Message-ID: <154502884653.30629.3172839440883293817.stgit@devbox> (raw)
In-Reply-To: <154502881646.30629.9938335052821665530.stgit@devbox>
Move extable address check into arch_prepare_kprobe() from
arch_within_kprobe_blacklist().
Please do not blacklisting instructions on exception_table,
since it is a kind of architectural unsupported instruction.
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
---
arch/arm64/kernel/probes/kprobes.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/kernel/probes/kprobes.c b/arch/arm64/kernel/probes/kprobes.c
index 2a5b338b2542..b2d4b7428ebc 100644
--- a/arch/arm64/kernel/probes/kprobes.c
+++ b/arch/arm64/kernel/probes/kprobes.c
@@ -102,6 +102,10 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p)
if (in_exception_text(probe_addr))
return -EINVAL;
+
+ if (search_exception_tables(probe_addr))
+ return -EINVAL;
+
if (probe_addr >= (unsigned long) __start_rodata &&
probe_addr <= (unsigned long) __end_rodata)
return -EINVAL;
@@ -477,8 +481,7 @@ bool arch_within_kprobe_blacklist(unsigned long addr)
(addr >= (unsigned long)__entry_text_start &&
addr < (unsigned long)__entry_text_end) ||
(addr >= (unsigned long)__idmap_text_start &&
- addr < (unsigned long)__idmap_text_end) ||
- !!search_exception_tables(addr))
+ addr < (unsigned long)__idmap_text_end))
return true;
if (!is_kernel_in_hyp_mode()) {
next prev parent reply other threads:[~2018-12-17 6:41 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-17 6:40 [PATCH 0/3] arm64: kprobes: Fix blacklist checking on arm64 Masami Hiramatsu
2018-12-17 6:40 ` Masami Hiramatsu [this message]
2019-01-03 17:05 ` [PATCH 1/3] arm64: kprobes: Move extable address check into arch_prepare_kprobe() James Morse
2019-01-08 2:39 ` Masami Hiramatsu
2019-01-08 17:13 ` James Morse
2019-01-09 2:05 ` Masami Hiramatsu
2019-01-11 18:22 ` James Morse
2019-01-15 5:49 ` Masami Hiramatsu
2018-12-17 6:41 ` [PATCH 2/3] arm64: kprobes: Remove unneeded RODATA check Masami Hiramatsu
2019-01-03 17:07 ` James Morse
2018-12-17 6:41 ` [PATCH 3/3] arm64: kprobes: Move exception_text check in blacklist Masami Hiramatsu
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=154502884653.30629.3172839440883293817.stgit@devbox \
--to=mhiramat@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=dave.long@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=panand@redhat.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).