git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From kniv@yandex-team.ru  Tue Dec 17 09:59:08 2024
   2 From: Nikolay Kuratov <kniv@yandex-team.ru>
   3 Date: Mon, 16 Dec 2024 14:19:23 +0300
   4 Subject: tracing/kprobes: Skip symbol counting logic for module symbols in create_local_trace_kprobe()
   5 To: stable@vger.kernel.org
   6 Cc: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, Masami Hiramatsu <mhiramat@kernel.org>, Francis Laniel <flaniel@linux.microsoft.com>, Steven Rostedt <rostedt@goodmis.org>, Mathieu Desnoyers <mathieu.desnoyers@efficios.com>, Nikolay Kuratov <kniv@yandex-team.ru>
   7 Message-ID: <20241216111923.2547104-1-kniv@yandex-team.ru>
   8
   9 From: Nikolay Kuratov <kniv@yandex-team.ru>
  10
  11 commit b022f0c7e404 ("tracing/kprobes: Return EADDRNOTAVAIL when func matches several symbols")
  12 avoids checking number_of_same_symbols() for module symbol in
  13 __trace_kprobe_create(), but create_local_trace_kprobe() should avoid this
  14 check too. Doing this check leads to ENOENT for module_name:symbol_name
  15 constructions passed over perf_event_open.
  16
  17 No bug in newer kernels as it was fixed more generally by
  18 commit 9d8616034f16 ("tracing/kprobes: Add symbol counting check when module loads")
  19
  20 Link: https://lore.kernel.org/linux-trace-kernel/20240705161030.b3ddb33a8167013b9b1da202@kernel.org
  21 Fixes: b022f0c7e404 ("tracing/kprobes: Return EADDRNOTAVAIL when func matches several symbols")
  22 Signed-off-by: Nikolay Kuratov <kniv@yandex-team.ru>
  23 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  24 ---
  25 v1 -> v2:
  26  * Reword commit title and message
  27  * Send for stable instead of mainline
  28
  29  kernel/trace/trace_kprobe.c |    2 +-
  30  1 file changed, 1 insertion(+), 1 deletion(-)
  31
  32 --- a/kernel/trace/trace_kprobe.c
  33 +++ b/kernel/trace/trace_kprobe.c
  34 @@ -1663,7 +1663,7 @@ create_local_trace_kprobe(char *func, vo
  35         int ret;
  36         char *event;
  37
  38 -       if (func) {
  39 +       if (func && !strchr(func, ':')) {
  40                 unsigned int count;
  41
  42                 count = number_of_same_symbols(func);