diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-02-17 07:59:47 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-02-17 07:59:47 -0800 |
| commit | ad645dea35c1381890bb190f208f8e62c61e3cbd (patch) | |
| tree | ff6bf0889c9d51ea39dc26c2aabf70dcf88bc135 | |
| parent | 55f626f2d0c81b33552ce0e59b63a0110807bad2 (diff) | |
| parent | 9704669c386f9bbfef2e002e7e690c56b7dcf5de (diff) | |
Merge tag 'probes-fixes-v6.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace
Pull probes fix from Masami Hiramatsu:
- tracing/probes: Fix BTF structure member finder to find the members
which are placed after any anonymous union member correctly.
* tag 'probes-fixes-v6.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
tracing/probes: Fix to search structure fields correctly
| -rw-r--r-- | kernel/trace/trace_btf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/trace/trace_btf.c b/kernel/trace/trace_btf.c index ca224d53bfdc..5bbdbcbbde3c 100644 --- a/kernel/trace/trace_btf.c +++ b/kernel/trace/trace_btf.c @@ -91,8 +91,8 @@ retry: for_each_member(i, type, member) { if (!member->name_off) { /* Anonymous union/struct: push it for later use */ - type = btf_type_skip_modifiers(btf, member->type, &tid); - if (type && top < BTF_ANON_STACK_MAX) { + if (btf_type_skip_modifiers(btf, member->type, &tid) && + top < BTF_ANON_STACK_MAX) { anon_stack[top].tid = tid; anon_stack[top++].offset = cur_offset + member->offset; |