kprobes: Fix check for probe enabled in kill_kprobe()
authorLi Huafei <lihuafei1@huawei.com>
Sat, 26 Nov 2022 11:43:16 +0000 (19:43 +0800)
committerMasami Hiramatsu (Google) <mhiramat@kernel.org>
Mon, 28 Nov 2022 12:20:47 +0000 (21:20 +0900)
commit0c76ef3f26d5ef2ac2c21b47e7620cff35809fbb
tree622972e1a52031ef7a35895917ed9434c2a8e821
parent63a4dc0a0bb0e9bfeb2c88ccda81abdde4cdd6b8
kprobes: Fix check for probe enabled in kill_kprobe()

In kill_kprobe(), the check whether disarm_kprobe_ftrace() needs to be
called always fails. This is because before that we set the
KPROBE_FLAG_GONE flag for kprobe so that "!kprobe_disabled(p)" is always
false.

The disarm_kprobe_ftrace() call introduced by commit:

  0cb2f1372baa ("kprobes: Fix NULL pointer dereference at kprobe_ftrace_handler")

to fix the NULL pointer reference problem. When the probe is enabled, if
we do not disarm it, this problem still exists.

Fix it by putting the probe enabled check before setting the
KPROBE_FLAG_GONE flag.

Link: https://lore.kernel.org/all/20221126114316.201857-1-lihuafei1@huawei.com/
Fixes: 3031313eb3d54 ("kprobes: Fix to check probe enabled before disarm_kprobe_ftrace()")
Signed-off-by: Li Huafei <lihuafei1@huawei.com>
Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Reviewed-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
kernel/kprobes.c