From 13a17bec6ce0ce6abfea0cc68f8594ffa9c561f6 Mon Sep 17 00:00:00 2001 From: Borislav Petkov Date: Tue, 14 May 2019 14:41:50 +0800 Subject: [PATCH] x86/kprobes: Remove trampoline_handler() prototype mainline inclusion from mainline-5.0-rc1 commit 4b1bacab61aa category: bugfix bugzilla: 14017 CVE: NA ------------------------------------------------- ... and make it static. It is called only by the kretprobe_trampoline() from asm. It was marked __visible so that it is visible outside of the current compilation unit but that is not needed as it is used only in this compilation unit. Signed-off-by: Borislav Petkov Cc: Masami Hiramatsu Link: https://lkml.kernel.org/r/20181205162526.GB109259@gmail.com Signed-off-by: Hongbo Yao Reviewed-by: Chen Zhou Signed-off-by: Yang Yingliang --- arch/x86/kernel/kprobes/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c index acb901b43ce4..99cc7ba61d68 100644 --- a/arch/x86/kernel/kprobes/core.c +++ b/arch/x86/kernel/kprobes/core.c @@ -752,7 +752,7 @@ STACK_FRAME_NON_STANDARD(kretprobe_trampoline); /* * Called from kretprobe_trampoline */ -__visible __used void *trampoline_handler(struct pt_regs *regs) +static __used void *trampoline_handler(struct pt_regs *regs) { struct kretprobe_instance *ri = NULL; struct hlist_head *head, empty_rp; -- GitLab