Skip to content

Commit ad645de

Browse files
committed
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
2 parents 55f626f + 9704669 commit ad645de

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

kernel/trace/trace_btf.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ const struct btf_member *btf_find_struct_member(struct btf *btf,
9191
for_each_member(i, type, member) {
9292
if (!member->name_off) {
9393
/* Anonymous union/struct: push it for later use */
94-
type = btf_type_skip_modifiers(btf, member->type, &tid);
95-
if (type && top < BTF_ANON_STACK_MAX) {
94+
if (btf_type_skip_modifiers(btf, member->type, &tid) &&
95+
top < BTF_ANON_STACK_MAX) {
9696
anon_stack[top].tid = tid;
9797
anon_stack[top++].offset =
9898
cur_offset + member->offset;

0 commit comments

Comments
 (0)