tracing/probes: Fix to search structure fields correctly

Fix to search a field from the structure which has anonymous union
correctly.
Since the reference `type` pointer was updated in the loop, the search
loop suddenly aborted where it hits an anonymous union. Thus it can not
find the field after the anonymous union. This avoids updating the
cursor `type` pointer in the loop.

Link: https://lore.kernel.org/all/170791694361.389532.10047514554799419688.stgit@devnote2/

Fixes: 302db0f5 ("tracing/probes: Add a function to search a member of a struct/union")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarMasami Hiramatsu (Google) <mhiramat@kernel.org>
parent 841c3516
...@@ -91,8 +91,8 @@ const struct btf_member *btf_find_struct_member(struct btf *btf, ...@@ -91,8 +91,8 @@ const struct btf_member *btf_find_struct_member(struct btf *btf,
for_each_member(i, type, member) { for_each_member(i, type, member) {
if (!member->name_off) { if (!member->name_off) {
/* Anonymous union/struct: push it for later use */ /* Anonymous union/struct: push it for later use */
type = btf_type_skip_modifiers(btf, member->type, &tid); if (btf_type_skip_modifiers(btf, member->type, &tid) &&
if (type && top < BTF_ANON_STACK_MAX) { top < BTF_ANON_STACK_MAX) {
anon_stack[top].tid = tid; anon_stack[top].tid = tid;
anon_stack[top++].offset = anon_stack[top++].offset =
cur_offset + member->offset; cur_offset + member->offset;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment