Skip to content

Commit bcb5320

Browse files
mhiramatingomolnar
authored andcommitted
kprobes: Fix to check probe enabled before disarm_kprobe_ftrace()
Commit: 0cb2f13 ("kprobes: Fix NULL pointer dereference at kprobe_ftrace_handler") fixed one bug but the underlying bugs are not completely fixed yet. If we run a kprobe_module.tc of ftracetest, a warning triggers: # ./ftracetest test.d/kprobe/kprobe_module.tc === Ftrace unit tests === [1] Kprobe dynamic event - probing module ... ------------[ cut here ]------------ Failed to disarm kprobe-ftrace at trace_printk_irq_work+0x0/0x7e [trace_printk] (-2) WARNING: CPU: 7 PID: 200 at kernel/kprobes.c:1091 __disarm_kprobe_ftrace.isra.0+0x7e/0xa0 This is because the kill_kprobe() calls disarm_kprobe_ftrace() even if the given probe is not enabled. In that case, ftrace_set_filter_ip() fails because the given probe point is not registered to ftrace. Fix to check the given (going) probe is enabled before invoking disarm_kprobe_ftrace(). Fixes: 0cb2f13 ("kprobes: Fix NULL pointer dereference at kprobe_ftrace_handler") Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org> Signed-off-by: Ingo Molnar <mingo@kernel.org> Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/159888672694.1411785.5987998076694782591.stgit@devnote2
1 parent 319f0ce commit bcb5320

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

kernel/kprobes.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2235,9 +2235,10 @@ static void kill_kprobe(struct kprobe *p)
22352235

22362236
/*
22372237
* The module is going away. We should disarm the kprobe which
2238-
* is using ftrace.
2238+
* is using ftrace, because ftrace framework is still available at
2239+
* MODULE_STATE_GOING notification.
22392240
*/
2240-
if (kprobe_ftrace(p))
2241+
if (kprobe_ftrace(p) && !kprobe_disabled(p) && !kprobes_all_disarmed)
22412242
disarm_kprobe_ftrace(p);
22422243
}
22432244

0 commit comments

Comments
 (0)