Commit ad645dea authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'probes-fixes-v6.8-rc4' of... 

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
parents 55f626f2 9704669c

kernel/trace/trace_btf.c

+2 −2
Original line number Diff line number Diff line
@@ -91,8 +91,8 @@ const struct btf_member *btf_find_struct_member(struct btf *btf, 
	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;