All of lore.kernel.org
 help / color / mirror / Atom feed
From: Masami Hiramatsu <mhiramat@kernel.org>
To: Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <will.deacon@arm.com>
Cc: Pratyush Anand <panand@redhat.com>,
	linux-kernel <linux-kernel@vger.kernel.org>,
	James Morse <james.morse@arm.com>,
	Masami Hiramatsu <mhiramat@kernel.org>,
	linux-arm-kernel@lists.infradead.org,
	"David A . Long" <dave.long@linaro.org>
Subject: [PATCH v2 3/4] arm64: kprobes: Move exception_text check in blacklist
Date: Tue, 15 Jan 2019 15:25:05 +0900	[thread overview]
Message-ID: <154753350520.31541.11995657762766497151.stgit@devbox> (raw)
In-Reply-To: <154753341900.31541.8135985235882849464.stgit@devbox>

Move exception/irqentry text address check in blacklist,
since those are symbol based rejection.

If we prohibit probing on the symbols in exception_text,
those should be blacklisted.

Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
---
 arch/arm64/kernel/probes/kprobes.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/kernel/probes/kprobes.c b/arch/arm64/kernel/probes/kprobes.c
index 1dae500d0a81..b9e9758b6534 100644
--- a/arch/arm64/kernel/probes/kprobes.c
+++ b/arch/arm64/kernel/probes/kprobes.c
@@ -98,9 +98,6 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p)
 	/* copy instruction */
 	p->opcode = le32_to_cpu(*p->addr);
 
-	if (in_exception_text(probe_addr))
-		return -EINVAL;
-
 	if (search_exception_tables(probe_addr))
 		return -EINVAL;
 
@@ -475,7 +472,8 @@ 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))
+	    addr < (unsigned long)__idmap_text_end) ||
+	    in_exception_text(addr))
 		return true;
 
 	if (!is_kernel_in_hyp_mode()) {


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

WARNING: multiple messages have this Message-ID (diff)
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>,
	James Morse <james.morse@arm.com>
Subject: [PATCH v2 3/4] arm64: kprobes: Move exception_text check in blacklist
Date: Tue, 15 Jan 2019 15:25:05 +0900	[thread overview]
Message-ID: <154753350520.31541.11995657762766497151.stgit@devbox> (raw)
In-Reply-To: <154753341900.31541.8135985235882849464.stgit@devbox>

Move exception/irqentry text address check in blacklist,
since those are symbol based rejection.

If we prohibit probing on the symbols in exception_text,
those should be blacklisted.

Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
---
 arch/arm64/kernel/probes/kprobes.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/kernel/probes/kprobes.c b/arch/arm64/kernel/probes/kprobes.c
index 1dae500d0a81..b9e9758b6534 100644
--- a/arch/arm64/kernel/probes/kprobes.c
+++ b/arch/arm64/kernel/probes/kprobes.c
@@ -98,9 +98,6 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p)
 	/* copy instruction */
 	p->opcode = le32_to_cpu(*p->addr);
 
-	if (in_exception_text(probe_addr))
-		return -EINVAL;
-
 	if (search_exception_tables(probe_addr))
 		return -EINVAL;
 
@@ -475,7 +472,8 @@ 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))
+	    addr < (unsigned long)__idmap_text_end) ||
+	    in_exception_text(addr))
 		return true;
 
 	if (!is_kernel_in_hyp_mode()) {


  parent reply	other threads:[~2019-01-15  6:25 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-15  6:23 [PATCH v2 0/4] arm64: kprobes: Update blacklist checking on arm64 Masami Hiramatsu
2019-01-15  6:23 ` Masami Hiramatsu
2019-01-15  6:24 ` [PATCH v2 1/4] arm64: kprobes: Move extable address check into arch_prepare_kprobe() Masami Hiramatsu
2019-01-15  6:24   ` Masami Hiramatsu
2019-01-15  6:24 ` [PATCH v2 2/4] arm64: kprobes: Remove unneeded RODATA check Masami Hiramatsu
2019-01-15  6:24   ` Masami Hiramatsu
2019-01-15 11:20   ` Mark Rutland
2019-01-15 11:20     ` Mark Rutland
2019-01-15  6:25 ` Masami Hiramatsu [this message]
2019-01-15  6:25   ` [PATCH v2 3/4] arm64: kprobes: Move exception_text check in blacklist Masami Hiramatsu
2019-01-21 12:08   ` James Morse
2019-01-21 12:08     ` James Morse
2019-01-15  6:25 ` [PATCH v2 4/4] arm64: kprobes: Use arch_populate_kprobe_blacklist() Masami Hiramatsu
2019-01-15  6:25   ` Masami Hiramatsu
2019-01-21 12:20   ` James Morse
2019-01-21 12:20     ` James Morse
2019-01-21 13:25     ` Masami Hiramatsu
2019-01-21 13:25       ` Masami Hiramatsu
2019-02-08  9:15       ` Will Deacon
2019-02-08  9:15         ` Will Deacon
2019-02-11 13:10         ` Masami Hiramatsu
2019-02-11 13:10           ` Masami Hiramatsu
2019-02-11 15:58           ` Will Deacon
2019-02-11 15:58             ` Will Deacon
2019-02-11 16:05             ` Marc Zyngier
2019-02-11 16:05               ` Marc Zyngier
2019-02-12 15:28               ` Masami Hiramatsu
2019-02-12 15:28                 ` Masami Hiramatsu
2019-01-16 13:40 ` [PATCH v2 0/4] arm64: kprobes: Update blacklist checking on arm64 Will Deacon
2019-01-16 13:40   ` Will Deacon
2019-01-19 13:31   ` Masami Hiramatsu
2019-01-19 13:31     ` 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=154753350520.31541.11995657762766497151.stgit@devbox \
    --to=mhiramat@kernel.org \
    --cc=catalin.marinas@arm.com \
    --cc=dave.long@linaro.org \
    --cc=james.morse@arm.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.