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

torvalds · torvalds · commit 146430a0c26e · 2024-08-09T09:43:46.000-07:00
Pull kprobe fixes from Masami Hiramatsu:

 - Fix misusing str_has_prefix() parameter order to check symbol prefix
   correctly

 - bpf: remove unused declaring of bpf_kprobe_override

* tag 'probes-fixes-v6.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
  kprobes: Fix to check symbol prefixes correctly
  bpf: kprobe: remove unused declaring of bpf_kprobe_override
diff --git 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
@@ -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,

Original file line number	Diff line number	Diff line change
`@@ -1557,8 +1557,8 @@ static bool is_cfi_preamble_symbol(unsigned long addr)`
`1557`	`1557`	`if (lookup_symbol_name(addr, symbuf))`
`1558`	`1558`	`return false;`
`1559`	`1559`
`1560`		`- return str_has_prefix("__cfi_", symbuf) \|\|`
`1561`		`- str_has_prefix("__pfx_", symbuf);`
	`1560`	`+ return str_has_prefix(symbuf, "__cfi_") \|\|`
	`1561`	`+ str_has_prefix(symbuf, "__pfx_");`
`1562`	`1562`	`}`
`1563`	`1563`
`1564`	`1564`	`static int check_kprobe_address_safe(struct kprobe *p,`