summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Righi <righi.andrea@gmail.com>2019-02-13 01:15:34 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-04-05 22:33:08 +0200
commitbc9d714395e2d44d35698b415c6dd7eea7189fc5 (patch)
tree4223cd5195c2e00b98b2995bcc04d30bf5aa6a7f
parentc63cc8d1487c3a15baa03c016a4b4344cbd0137d (diff)
downloadlinux-rpi3-bc9d714395e2d44d35698b415c6dd7eea7189fc5.tar.gz
linux-rpi3-bc9d714395e2d44d35698b415c6dd7eea7189fc5.tar.bz2
linux-rpi3-bc9d714395e2d44d35698b415c6dd7eea7189fc5.zip
kprobes: Prohibit probing on bsearch()
[ Upstream commit 02106f883cd745523f7766d90a739f983f19e650 ] Since kprobe breakpoing handler is using bsearch(), probing on this routine can cause recursive breakpoint problem. int3 ->do_int3() ->ftrace_int3_handler() ->ftrace_location() ->ftrace_location_range() ->bsearch() -> int3 Prohibit probing on bsearch(). Signed-off-by: Andrea Righi <righi.andrea@gmail.com> Acked-by: Masami Hiramatsu <mhiramat@kernel.org> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.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/154998813406.31052.8791425358974650922.stgit@devbox Signed-off-by: Ingo Molnar <mingo@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--lib/bsearch.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/bsearch.c b/lib/bsearch.c
index 18b445b010c3..82512fe7b33c 100644
--- a/lib/bsearch.c
+++ b/lib/bsearch.c
@@ -11,6 +11,7 @@
#include <linux/export.h>
#include <linux/bsearch.h>
+#include <linux/kprobes.h>
/*
* bsearch - binary search an array of elements
@@ -53,3 +54,4 @@ void *bsearch(const void *key, const void *base, size_t num, size_t size,
return NULL;
}
EXPORT_SYMBOL(bsearch);
+NOKPROBE_SYMBOL(bsearch);