Skip to content

kprobes: Fix and improve blacklist symbols

Masami Hiramatsu lkml 3 versions – In review

Get series with b4
b4 am 154998785011.31052.1475728497912659748.stgit@devbox

Versions newest first · linked by author and title

  1. v3 Latest10 patches 7 repliesIn review
  2. v29 patches 8 repliesSuperseded
  3. v19 patches 6 repliesSuperseded

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/10x86/kprobes: Prohibit probing on optprobe template codearch/x86/kernel/kprobes/opt.c+5 -00 replies
2/10x86/kprobes: Move trampoline code into RODATAarch/x86/kernel/kprobes/opt.c+2 -70 replies
3/10x86/kprobes: Prohibit probing on functions before kprobe_int3_handler()arch/x86/kernel/alternative.c arch/x86/kernel/ftrace.c arch/x86/kernel/traps.c +1 more+7 -20 replies
4/10x86/kprobes: Prohibit probing on IRQ handlers directlyarch/x86/kernel/kprobes/core.c+7 -03 replies
5/10kprobes: Search non-suffixed symbol in blacklistkernel/kprobes.c+20 -14 replies
6/10kprobes: Prohibit probing on hardirq tracerskernel/trace/trace_irqsoff.c kernel/trace/trace_preemptirq.c+12 -20 replies
7/10kprobes: Prohibit probing on preempt_check debug functionslib/smp_processor_id.c+5 -20 replies
8/10kprobes: Prohibit probing on RCU debug routinekernel/rcu/update.c+2 -00 replies
9/10kprobes: Prohibit probing on lockdep functionskernel/locking/lockdep.c+6 -10 replies
10/10kprobes: Prohibit probing on bsearch()lib/bsearch.c+2 -00 replies

Reviews trailers per patch

2 of 10 patches have a Reviewed-by or Acked-by.

PatchSteven Rostedt (VMware)Masami Hiramatsu
1/10
2/10
3/10
4/10
5/10
6/10A-b
7/10
8/10
9/10
10/10A-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v3 thread

Cover letter [PATCH -tip v3 00/10] kprobes: Fix and improve blacklist symbols

Hi,

Here is the v3 series of kprobes blacklist bugfix and improvements mainly on x86 (since I started testing on qemu-x86).

This version is just rebased on top of -tip master branch and add bsearch nokprobe patch by Andrea (Thanks!)

This has been started from discussion about KPROBE_ENENTS_ON_NOTRACE configuration. I tried to find notrace functions which can cause kernel crash with kprobes using following script.

====
#!/bin/sh

i=0;
cat notrace_functions | while read f ; do
if echo p:event$i $f >> /sys/kernel/debug/tracing/kprobe_events; then
echo "Probing on $f"
echo 1 > /sys/kernel/debug/tracing/events/kprobes/event$i/enable
fi
i=$((i+1))
done
====

And I found several functions which must be blacklisted.
- optprobe template code, which is just a template code and never be executed. Moreover, since it can be copied and reused, if we probe it, it modifies the template code and can cause a crash. ([1/10][2/10])
- functions which is called before kprobe_int3_handler() handles kprobes. This can cause a breakpoint recursion. ([3/10])
- IRQ entry text, which should not be probed since register/pagetable status has not been stable at that point. ([4/10])
- Suffixed symbols, like .constprop, .part etc. Those suffixed symbols never be blacklisted even if the non-suffixed version has been blacklisted. ([5/10])
- hardirq tracer also works before int3 handling. ([6/10])
- preempt_check debug function also is involved in int3 handling. ([7/10])
- RCU debug routine is also called before kprobe_int3_handler(). ([8/10])
- Some lockdep functions are also involved in int3 handling. ([9/10])
- bsearch() is involved in int3 handling because of ftrace is using it. ([10/10])

Of course there still may be some functions which can be called by configuration change, I'll continue to test it.

Thank you,

---

Andrea Righi (1):
kprobes: Prohibit probing on bsearch()

Masami Hiramatsu (9):
x86/kprobes: Prohibit probing on optprobe template code x86/kprobes: Move trampoline code into RODATA
x86/kprobes: Prohibit probing on functions before kprobe_int3_handler() x86/kprobes: Prohibit probing on IRQ handlers directly
kprobes: Search non-suffixed symbol in blacklist
kprobes: Prohibit probing on hardirq tracers
kprobes: Prohibit probing on preempt_check debug functions
kprobes: Prohibit probing on RCU debug routine
kprobes: Prohibit probing on lockdep functions

 arch/x86/kernel/alternative.c   |    3 ++-
 arch/x86/kernel/ftrace.c        |    3 ++-
 arch/x86/kernel/kprobes/core.c  |    7 +++++++
 arch/x86/kernel/kprobes/opt.c   |    4 ++--
 arch/x86/kernel/traps.c         |    1 +
 kernel/kprobes.c                |   21 ++++++++++++++++++++-
 kernel/locking/lockdep.c        |    7 ++++++-
 kernel/rcu/tree.c               |    2 ++
 kernel/rcu/update.c             |    2 ++
 kernel/trace/trace_irqsoff.c    |    9 +++++++--
 kernel/trace/trace_preemptirq.c |    5 +++++
 lib/bsearch.c                   |    2 ++
 lib/smp_processor_id.c          |    7 +++++--
 13 files changed, 63 insertions(+), 10 deletions(-)
Signature · 1 line
Masami Hiramatsu (Linaro) <[email protected]>