Linus,

Probes fixes for v7.1-rc6

- tracing/probes: Point the error offset correctly for eprobe argument error
  Fix the eprobe event parser to point error position correctly.


Please pull the latest probes-fixes-v7.1-rc6 tree, which can be found at:


  git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
probes-fixes-v7.1-rc6

Tag SHA1: 504a88cae60802a3c55eb5e8c2ae67ab641757d1
Head SHA1: 85e0f27dd1396307913ffc5745b0c05137e9beac


Masami Hiramatsu (Google) (1):
      tracing/probes: Point the error offset correctly for eprobe argument error

----
 kernel/trace/trace_probe.c                                              | 2 --
 tools/testing/selftests/ftrace/test.d/dynevent/eprobes_syntax_errors.tc | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)
---------------------------
commit 85e0f27dd1396307913ffc5745b0c05137e9beac
Author: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Date:   Mon May 25 11:21:14 2026 +0900

    tracing/probes: Point the error offset correctly for eprobe argument error
    
    Fix to point the error offset correctly for eprobe argument error.
    In the cleanup commit 1b8b0cd754cd ("tracing/probes: Move event parameter
    fetching code to common parser"), due to incorrect backward compatibility
    aimed at conforming to the test specifications, the error location was set
    to 0 when a non-existent formal parameter was specified for Eprobe.
    However, this should be corrected in both the test and the implementation
    to point correct error position.
    
    Link: https://lore.kernel.org/all/177967567399.209006.1451571244515632097.stgit@devnote2/
    
    Fixes: 1b8b0cd754cd ("tracing/probes: Move event parameter fetching code to common parser")
    Cc: stable@vger.kernel.org
    Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
    Reviewed-by: Steven Rostedt <rostedt@goodmis.org>

diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c
index e0d3a0da26af..44c22d4e7881 100644
--- a/kernel/trace/trace_probe.c
+++ b/kernel/trace/trace_probe.c
@@ -962,8 +962,6 @@ static int parse_probe_vars(char *orig_arg, const struct fetch_type *t,
 			code->op = FETCH_OP_COMM;
 			return 0;
 		}
-		/* backward compatibility */
-		ctx->offset = 0;
 		goto inval;
 	}
 
diff --git a/tools/testing/selftests/ftrace/test.d/dynevent/eprobes_syntax_errors.tc b/tools/testing/selftests/ftrace/test.d/dynevent/eprobes_syntax_errors.tc
index 4f5e8c665156..2a680c086047 100644
--- a/tools/testing/selftests/ftrace/test.d/dynevent/eprobes_syntax_errors.tc
+++ b/tools/testing/selftests/ftrace/test.d/dynevent/eprobes_syntax_errors.tc
@@ -20,7 +20,7 @@ check_error 'e:foo/^123456789012345678901234567890123456789012345678901234567890
 check_error 'e:foo/^bar.1 syscalls/sys_enter_openat'	# BAD_EVENT_NAME
 
 check_error 'e:foo/bar syscalls/sys_enter_openat arg=^dfd'	# BAD_FETCH_ARG
-check_error 'e:foo/bar syscalls/sys_enter_openat ^arg=$foo'	# BAD_ATTACH_ARG
+check_error 'e:foo/bar syscalls/sys_enter_openat arg=^$foo'	# BAD_ATTACH_ARG
 
 if grep -q '<attached-group>\.<attached-event>.*\[if <filter>\]' README; then
   check_error 'e:foo/bar syscalls/sys_enter_openat if ^'	# NO_EP_FILTER

-- 
Masami Hiramatsu (Google) <mhiramat@kernel.org>

The pull request you sent on Fri, 5 Jun 2026 22:48:28 +0900:

> git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git probes-fixes-v7.1-rc6

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/d1b0937f0eadbc30b528d37589ec7fb6ce9f4114

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html