History

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

Pull tracing/probes fix from Masami Hiramatsu: "Fix the eprobe event parser to point error position correctly" * tag 'probes-fixes-v7.1-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace: tracing/probes: Point the error offset correctly for eprobe argument error

Linus Torvalds committed 5 months ago

Commit d1b09372 parents a8dc5f6 85e0f272 files · +1 −3Browse files

Unified · Split

2 files
  1. kernel/trace/trace_probe.c +0 −2
  2. tools/testing/selftests/ftrace/test.d/dynevent/eprobes_syntax_errors.tc +1 −1
kernel/trace/trace_probe.c+0−2
@@ -962,8 +962,6 @@ static int parse_probe_vars(char *orig_arg, const struct fetch_type *t, · 961 unmodified lines
962 code->op = FETCH_OP_COMM;962 code->op = FETCH_OP_COMM;
963 return 0;963 return 0;
964 }964 }
965 /* backward compatibility */
966 ctx->offset = 0;
967 goto inval;965 goto inval;
968 }966 }
969 967
tools/testing/selftests/ftrace/test.d/dynevent/eprobes_syntax_errors.tc+1−1
@@ -20,7 +20,7 @@ check_error 'e:foo/^123456789012345678901234567890123456789012345678901234567890 · 19 unmodified lines
20check_error 'e:foo/^bar.1 syscalls/sys_enter_openat' # BAD_EVENT_NAME20check_error 'e:foo/^bar.1 syscalls/sys_enter_openat' # BAD_EVENT_NAME
21 21
22check_error 'e:foo/bar syscalls/sys_enter_openat arg=^dfd' # BAD_FETCH_ARG22check_error 'e:foo/bar syscalls/sys_enter_openat arg=^dfd' # BAD_FETCH_ARG
23check_error 'e:foo/bar syscalls/sys_enter_openat ^arg=$foo' # BAD_ATTACH_ARG23check_error 'e:foo/bar syscalls/sys_enter_openat arg=^$foo' # BAD_ATTACH_ARG
24 24
25if grep -q '<attached-group>\.<attached-event>.*\[if <filter>\]' README; then25if grep -q '<attached-group>\.<attached-event>.*\[if <filter>\]' README; then
26 check_error 'e:foo/bar syscalls/sys_enter_openat if ^' # NO_EP_FILTER26 check_error 'e:foo/bar syscalls/sys_enter_openat if ^' # NO_EP_FILTER

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t