Original code failed to disarm the probed instruction after echo 0 > /sys/kernel/debug/kprobes/enabled
if OPTPROBE is enabled. This patch checks kprobes_all_disarmed in unoptimized_kprobe(). Signed-off-by: Wang Nan <[email protected]> --- kernel/kprobes.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kernel/kprobes.c b/kernel/kprobes.c index 9471710..f16936b 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -630,6 +630,9 @@ static void unoptimize_kprobe(struct kprobe *p, bool force) { struct optimized_kprobe *op; + if (kprobes_all_disarmed) + return; + if (!kprobe_aggrprobe(p) || kprobe_disarmed(p)) return; /* This is not an optprobe nor optimized */ -- 1.8.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
