From: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-arch@vger.kernel.org,
Ananth N Mavinakayanahalli <ananth@in.ibm.com>,
Sandeepa Prabhu <sandeepa.prabhu@linaro.org>,
x86@kernel.org, lkml <linux-kernel@vger.kernel.org>,
"Steven Rostedt (Red Hat)" <rostedt@goodmis.org>,
Ingo Molnar <mingo@redhat.com>,
systemtap@sourceware.org, "H. Peter Anvin" <hpa@zytor.com>,
Thomas Gleixner <tglx@linutronix.de>,
"David S. Miller" <davem@davemloft.net>
Subject: [PATCH -tip v5 05/18] [BUGFIX] x86: Prohibit probing on thunk functions and restore
Date: Mon, 09 Dec 2013 10:53:00 -0000 [thread overview]
Message-ID: <20131209104730.13397.70208.stgit@kbuild-fedora.novalocal> (raw)
In-Reply-To: <20131209104717.13397.8864.stgit@kbuild-fedora.novalocal>
thunk/restore functions are also used for tracing irqoff etc.
and those are involved in kprobe's exception handling.
Prohibit probing on them to avoid kernel crash.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
---
arch/x86/lib/thunk_32.S | 3 ++-
arch/x86/lib/thunk_64.S | 3 +++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/arch/x86/lib/thunk_32.S b/arch/x86/lib/thunk_32.S
index 2930ae0..28f85c91 100644
--- a/arch/x86/lib/thunk_32.S
+++ b/arch/x86/lib/thunk_32.S
@@ -4,8 +4,8 @@
* (inspired by Andi Kleen's thunk_64.S)
* Subject to the GNU public license, v.2. No warranty of any kind.
*/
-
#include <linux/linkage.h>
+ #include <asm/asm.h>
#ifdef CONFIG_TRACE_IRQFLAGS
/* put return address in eax (arg1) */
@@ -22,6 +22,7 @@
popl %ecx
popl %eax
ret
+ _ASM_NOKPROBE(\name)
.endm
thunk_ra trace_hardirqs_on_thunk,trace_hardirqs_on_caller
diff --git a/arch/x86/lib/thunk_64.S b/arch/x86/lib/thunk_64.S
index a63efd6..92d9fea 100644
--- a/arch/x86/lib/thunk_64.S
+++ b/arch/x86/lib/thunk_64.S
@@ -8,6 +8,7 @@
#include <linux/linkage.h>
#include <asm/dwarf2.h>
#include <asm/calling.h>
+#include <asm/asm.h>
/* rdi: arg1 ... normal C conventions. rax is saved/restored. */
.macro THUNK name, func, put_ret_addr_in_rdi=0
@@ -25,6 +26,7 @@
call \func
jmp restore
CFI_ENDPROC
+ _ASM_NOKPROBE(\name)
.endm
#ifdef CONFIG_TRACE_IRQFLAGS
@@ -43,3 +45,4 @@ restore:
RESTORE_ARGS
ret
CFI_ENDPROC
+ _ASM_NOKPROBE(restore)
next prev parent reply other threads:[~2013-12-09 10:53 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-09 10:53 [PATCH -tip v5 00/18] kprobes: introduce NOKPROBE_SYMBOL(), cleanup and fixes crash bugs Masami Hiramatsu
2013-12-09 10:53 ` [PATCH -tip v5 13/18] notifier: Use NOKPROBE_SYMBOL macro in notifier Masami Hiramatsu
2013-12-11 2:58 ` Masami Hiramatsu
2013-12-11 3:04 ` Masami Hiramatsu
2013-12-09 10:53 ` [PATCH -tip v5 16/18] kprobes: Support blacklist functions in module Masami Hiramatsu
2013-12-09 10:53 ` [PATCH -tip v5 17/18] kprobes: Use NOKPROBE_SYMBOL() in sample modules Masami Hiramatsu
2013-12-09 10:53 ` [PATCH -tip v5 15/18] kprobes: Show blacklist entries via debugfs Masami Hiramatsu
2013-12-09 10:53 ` [PATCH -tip v5 12/18] ftrace/kprobes: Use NOKPROBE_SYMBOL macro in ftrace Masami Hiramatsu
2013-12-09 17:05 ` Steven Rostedt
2013-12-10 8:54 ` Masami Hiramatsu
2013-12-10 10:03 ` [PATCH -tip v5.1 " Masami Hiramatsu
2013-12-12 1:34 ` Steven Rostedt
2013-12-12 4:13 ` Masami Hiramatsu
2013-12-09 10:53 ` [PATCH -tip v5 08/18] kprobes: Allow probe on some kprobe functions Masami Hiramatsu
2013-12-09 10:53 ` [PATCH -tip v5 02/18] kprobes: Introduce NOKPROBE_SYMBOL() macro for blacklist Masami Hiramatsu
2013-12-09 10:53 ` [PATCH -tip v5 14/18] sched: Use NOKPROBE_SYMBOL macro in sched Masami Hiramatsu
2013-12-09 10:53 ` [PATCH -tip v5 01/18] kprobes: Prohibit probing on .entry.text code Masami Hiramatsu
2013-12-09 10:53 ` [PATCH -tip v5 18/18] kprobes/x86: Use kprobe_blacklist for .kprobes.text and .entry.text Masami Hiramatsu
2013-12-09 10:53 ` [PATCH -tip v5 07/18] kprobes/x86: Allow probe on some kprobe preparation functions Masami Hiramatsu
2013-12-09 10:53 ` [PATCH -tip v5 06/18] kprobes/x86: Call exception handlers directly from do_int3/do_debug Masami Hiramatsu
2013-12-09 10:53 ` [PATCH -tip v5 03/18] [BUGFIX] kprobes/x86: Prohibit probing on debug_stack_* Masami Hiramatsu
2013-12-09 10:53 ` [PATCH -tip v5 04/18] [BUGFIX] x86: Prohibit probing on native_set_debugreg Masami Hiramatsu
2013-12-09 10:53 ` [PATCH -tip v5 09/18] ftrace/kprobes: Allow probing on some preparation functions Masami Hiramatsu
2013-12-09 10:53 ` Masami Hiramatsu [this message]
2013-12-09 10:53 ` [PATCH -tip v5 10/18] x86: Use NOKPROBE_SYMBOL() instead of __kprobes annotation Masami Hiramatsu
2013-12-09 10:53 ` [PATCH -tip v5 11/18] kprobes: Use NOKPROBE_SYMBOL macro instead of __kprobes 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=20131209104730.13397.70208.stgit@kbuild-fedora.novalocal \
--to=masami.hiramatsu.pt@hitachi.com \
--cc=ananth@in.ibm.com \
--cc=davem@davemloft.net \
--cc=hpa@zytor.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=mingo@redhat.com \
--cc=rostedt@goodmis.org \
--cc=sandeepa.prabhu@linaro.org \
--cc=systemtap@sourceware.org \
--cc=tglx@linutronix.de \
--cc=x86@kernel.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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).