diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-06-03 08:23:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-06-03 08:23:16 -0400 |
| commit | 51f269a6ecc701f9932eff5b253a1f89746be6bd (patch) | |
| tree | 1f4afc696982a8bfc4c559a0e4dcbd5ccab56401 /kernel | |
| parent | 4ecd704a4c51fd95973fcc3a60444e0e24eb9439 (diff) | |
| parent | eb50d0f250e96ede9192d936d220cd97adc93b89 (diff) | |
Merge tag 'probes-fixes-6.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace
Pull probes fixes from Masami Hiramatsu:
- Return NULL if the trace_probe list on trace_probe_event is empty
- selftests/ftrace: Choose testing symbol name for filtering feature
from sample data instead of fixed symbol
* tag 'probes-fixes-6.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
selftests/ftrace: Choose target function for filter test from samples
tracing/probe: trace_probe_primary_from_call(): checked list_first_entry
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/trace/trace_probe.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_probe.h b/kernel/trace/trace_probe.h index ef8ed3b65d05..6a4ecfb1da43 100644 --- a/kernel/trace/trace_probe.h +++ b/kernel/trace/trace_probe.h @@ -308,7 +308,7 @@ trace_probe_primary_from_call(struct trace_event_call *call) { struct trace_probe_event *tpe = trace_probe_event_from_call(call); - return list_first_entry(&tpe->probes, struct trace_probe, list); + return list_first_entry_or_null(&tpe->probes, struct trace_probe, list); } static inline struct list_head *trace_probe_probe_list(struct trace_probe *tp) |