kevin/linux
1
Fork 0
Code

tracing/probes: Fix to search structure fields correctly

Browse Source 
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: 302db0f5b3 ("tracing/probes: Add a function to search a member of a struct/union")
Cc: stable@vger.kernel.org
Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
This commit is contained in:
Masami Hiramatsu (Google) 2024-02-17 21:25:42 +09:00
parent 841c351693
commit 9704669c38
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/trace/trace_btf.c
View File

@ -91,8 +91,8 @@ retry:
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;