Commit fa68bd09 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

kprobe/static_call: Restore missing static_call_text_reserved() 

Restore two hunks from commit:

  6333e8f7 ("static_call: Avoid kprobes on inline static_call()s")

that went walkabout in a Git merge commit.

Fixes: 76d4acf2 ("Merge tag 'perf-kprobes-2020-12-14' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip"

)
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Link: https://lore.kernel.org/r/20210628113045.167127609@infradead.org


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 2bee6d16

kernel/kprobes.c

+2 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <linux/ftrace.h>

#include <linux/cpu.h>

#include <linux/jump_label.h>

#include <linux/static_call.h>

#include <linux/perf_event.h>



#include <asm/sections.h>
@@ -1551,6 +1552,7 @@ static int check_kprobe_address_safe(struct kprobe *p, 
	if (!kernel_text_address((unsigned long) p->addr) ||

	    within_kprobe_blacklist((unsigned long) p->addr) ||

	    jump_label_text_reserved(p->addr, p->addr) ||

	    static_call_text_reserved(p->addr, p->addr) ||

	    find_bug((unsigned long)p->addr)) {

		ret = -EINVAL;

		goto out;