[GIT PULL] probes: Fixes for v6.11-rc2

[Google]

Hi Linus,

Probes fixes for v6.11-rc2:

- kprobes: Fix misusing str_has_prefix() parameter order to check symbol
  prefix correctly.
- bpf: kprobe: remove unused declaring of bpf_kprobe_override.


Please pull the latest probes-fixes-v6.11-rc2 tree, which can be found at:


  git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
probes-fixes-v6.11-rc2

Tag SHA1: 495cd5d4c81ddcbaf8f5e2d7768292adc7309e2a
Head SHA1: 8c8acb8f26cbde665b233dd1b9bbcbb9b86822dc


Masami Hiramatsu (Google) (1):
      kprobes: Fix to check symbol prefixes correctly

Menglong Dong (1):
      bpf: kprobe: remove unused declaring of bpf_kprobe_override

----
 include/linux/trace_events.h | 1 -
 kernel/kprobes.c             | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)
---------------------------
diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h
index 9df3e2973626..9435185c10ef 100644
--- a/include/linux/trace_events.h
+++ b/include/linux/trace_events.h
@@ -880,7 +880,6 @@ do {									\
 struct perf_event;
 
 DECLARE_PER_CPU(struct pt_regs, perf_trace_regs);
-DECLARE_PER_CPU(int, bpf_kprobe_override);
 
 extern int  perf_trace_init(struct perf_event *event);
 extern void perf_trace_destroy(struct perf_event *event);
diff --git a/kernel/kprobes.c b/kernel/kprobes.c
index e85de37d9e1e..da59c68df841 100644
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@ -1557,8 +1557,8 @@ static bool is_cfi_preamble_symbol(unsigned long addr)
 	if (lookup_symbol_name(addr, symbuf))
 		return false;
 
-	return str_has_prefix("__cfi_", symbuf) ||
-		str_has_prefix("__pfx_", symbuf);
+	return str_has_prefix(symbuf, "__cfi_") ||
+		str_has_prefix(symbuf, "__pfx_");
 }
 
 static int check_kprobe_address_safe(struct kprobe *p,

-- 
Masami Hiramatsu (Google) <mhiramat@xxxxxxxxxx>