Commit d6e6286a authored by Andrii Nakryiko's avatar Andrii Nakryiko Committed by Alexei Starovoitov
Browse files

libbpf: disassociate section handler on explicit bpf_program__set_type() call 



If user explicitly overrides programs's type with
bpf_program__set_type() API call, we need to disassociate whatever
SEC_DEF handler libbpf determined initially based on program's SEC()
definition, as it's not goind to be valid anymore and could lead to
crashes and/or confusing failures.

Also, fix up bpf_prog_test_load() helper in selftests/bpf, which is
force-setting program type (even if that's completely unnecessary; this
is quite a legacy piece of code), and thus should expect auto-attach to
not work, yet one of the tests explicitly relies on auto-attach for
testing.

Instead, force-set program type only if it differs from the desired one.

Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/r/20230327185202.1929145-2-andrii@kernel.org


Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent 8b52cc2a

tools/lib/bpf/libbpf.c

+1 −0
Original line number Diff line number Diff line
@@ -8468,6 +8468,7 @@ int bpf_program__set_type(struct bpf_program *prog, enum bpf_prog_type type) 
		return libbpf_err(-EBUSY);



	prog->type = type;

	prog->sec_def = NULL;

	return 0;

}

tools/testing/selftests/bpf/testing_helpers.c

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ int bpf_prog_test_load(const char *file, enum bpf_prog_type type, 
		goto err_out;

	}



	if (type != BPF_PROG_TYPE_UNSPEC)

	if (type != BPF_PROG_TYPE_UNSPEC && bpf_program__type(prog) != type)

		bpf_program__set_type(prog, type);



	flags = bpf_program__flags(prog) | BPF_F_TEST_RND_HI32;