[tip:perf/core] kprobes: Disabling optimized kprobes for entry text section

[tip-bot for Jiri Olsa]

Commit-ID:  2a8247a2600c3e087a568fc68a6ec4eedac27ef1
Gitweb:     http://git.kernel.org/tip/2a8247a2600c3e087a568fc68a6ec4eedac27ef1
Author:     Jiri Olsa <jolsa@xxxxxxxxxx>
AuthorDate: Mon, 21 Feb 2011 15:25:13 +0100
Committer:  Ingo Molnar <mingo@xxxxxxx>
CommitDate: Tue, 8 Mar 2011 17:22:12 +0100

kprobes: Disabling optimized kprobes for entry text section

You can crash the kernel (with root/admin privileges) using kprobe tracer by running:

 echo "p system_call_after_swapgs" > ./kprobe_events
 echo 1 > ./events/kprobes/enable

The reason is that at the system_call_after_swapgs label, the
kernel stack is not set up. If optimized kprobes are enabled,
the user space stack is being used in this case (see optimized
kprobe template) and this might result in a crash.

There are several places like this over the entry code
(entry_$BIT). As it seems there's no any reasonable/maintainable
way to disable only those places where the stack is not ready, I
switched off the whole entry code from kprobe optimizing.

Signed-off-by: Jiri Olsa <jolsa@xxxxxxxxxx>
Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
Cc: acme@xxxxxxxxxx
Cc: fweisbec@xxxxxxxxx
Cc: ananth@xxxxxxxxxx
Cc: davem@xxxxxxxxxxxxx
Cc: a.p.zijlstra@xxxxxxxxx
Cc: eric.dumazet@xxxxxxxxx
Cc: 2nddept-manager@xxxxxxxxxxxxxxxxx
LKML-Reference: <1298298313-5980-3-git-send-email-jolsa@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
 arch/x86/kernel/kprobes.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c
index d91c477..c969fd9 100644
--- a/arch/x86/kernel/kprobes.c
+++ b/arch/x86/kernel/kprobes.c
@@ -1276,6 +1276,14 @@ static int __kprobes can_optimize(unsigned long paddr)
 	if (!kallsyms_lookup_size_offset(paddr, &size, &offset))
 		return 0;
 
+	/*
+	 * Do not optimize in the entry code due to the unstable
+	 * stack handling.
+	 */
+	if ((paddr >= (unsigned long )__entry_text_start) &&
+	    (paddr <  (unsigned long )__entry_text_end))
+		return 0;
+
 	/* Check there is enough space for a relative jump. */
 	if (size - offset < RELATIVEJUMP_SIZE)
 		return 0;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/