]> git.baikalelectronics.ru Git - kernel.git/commit
x86/kprobes: Fix __recover_optprobed_insn check optimizing logic
authorYang Jihong <yangjihong1@huawei.com>
Mon, 20 Feb 2023 23:49:16 +0000 (08:49 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 10 Mar 2023 08:34:13 +0000 (09:34 +0100)
commitea3d544cc9c2551bb76d6272aae4de90e9037ca6
tree856d526b8d664ee0b3e1cfa3810a6bff0666f7c7
parenta1c7e3b97d8ce483a56772a0baea86617d09d078
x86/kprobes: Fix __recover_optprobed_insn check optimizing logic

commit ed14d222d816fa7cd479e7563ee779d941ee7d5c upstream.

Since the following commit:

  commit 2d3ebe27fef7 ("kprobes: Set unoptimized flag after unoptimizing code")

modified the update timing of the KPROBE_FLAG_OPTIMIZED, a optimized_kprobe
may be in the optimizing or unoptimizing state when op.kp->flags
has KPROBE_FLAG_OPTIMIZED and op->list is not empty.

The __recover_optprobed_insn check logic is incorrect, a kprobe in the
unoptimizing state may be incorrectly determined as unoptimizing.
As a result, incorrect instructions are copied.

The optprobe_queued_unopt function needs to be exported for invoking in
arch directory.

Link: https://lore.kernel.org/all/20230216034247.32348-2-yangjihong1@huawei.com/
Fixes: 2d3ebe27fef7 ("kprobes: Set unoptimized flag after unoptimizing code")
Cc: stable@vger.kernel.org
Signed-off-by: Yang Jihong <yangjihong1@huawei.com>
Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/x86/kernel/kprobes/opt.c
include/linux/kprobes.h
kernel/kprobes.c