summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLi Huafei <lihuafei1@huawei.com>2022-03-10 20:09:15 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-03-16 14:26:51 +0100
commitaa093e28791d0b5c29e3753e15eb9cb852017cd4 (patch)
tree55f72f727cae0c133f62eaf52df02f8d105b58e0
parent248c6347720200b9e5f79a4339ddbe4ef0074d36 (diff)
downloadlinux-stable-aa093e28791d0b5c29e3753e15eb9cb852017cd4.tar.gz
linux-stable-aa093e28791d0b5c29e3753e15eb9cb852017cd4.tar.bz2
linux-stable-aa093e28791d0b5c29e3753e15eb9cb852017cd4.zip
x86/traps: Mark do_int3() NOKPROBE_SYMBOL
commit a365a65f9ca1ceb9cf1ac29db4a4f51df7c507ad upstream. Since kprobe_int3_handler() is called in do_int3(), probing do_int3() can cause a breakpoint recursion and crash the kernel. Therefore, do_int3() should be marked as NOKPROBE_SYMBOL. Fixes: 21e28290b317 ("x86/traps: Split int3 handler up") Signed-off-by: Li Huafei <lihuafei1@huawei.com> Signed-off-by: Borislav Petkov <bp@suse.de> Acked-by: Masami Hiramatsu <mhiramat@kernel.org> Cc: <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20220310120915.63349-1-lihuafei1@huawei.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/x86/kernel/traps.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index c9d566dcf89a..8143693a7ea6 100644
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -659,6 +659,7 @@ static bool do_int3(struct pt_regs *regs)
return res == NOTIFY_STOP;
}
+NOKPROBE_SYMBOL(do_int3);
static void do_int3_user(struct pt_regs *regs)
{