Commit 4f361895 authored by Jianyun Gao's avatar Jianyun Gao Committed by Andrii Nakryiko
Browse files

libbpf: Optimize the redundant code in the bpf_object__init_user_btf_maps() function. 



In the elf_sec_data() function, the input parameter 'scn' will be
evaluated. If it is NULL, then it will directly return NULL. Therefore,
the return value of the elf_sec_data() function already takes into
account the case where the input parameter scn is NULL. Therefore,
subsequently, the code only needs to check whether the return value of
the elf_sec_data() function is NULL.

Signed-off-by: default avatarJianyun Gao <jianyungao89@gmail.com>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Acked-by: default avatarYonghong Song <yonghong.song@linux.dev>
Link: https://lore.kernel.org/bpf/20251024080802.642189-1-jianyungao89@gmail.com
parent 23f852da

tools/lib/bpf/libbpf.c

+1 −1
Original line number Diff line number Diff line
@@ -2996,7 +2996,7 @@ static int bpf_object__init_user_btf_maps(struct bpf_object *obj, bool strict, 


	scn = elf_sec_by_idx(obj, obj->efile.btf_maps_shndx);

	data = elf_sec_data(obj, scn);

	if (!scn || !data) {

	if (!data) {

		pr_warn("elf: failed to get %s map definitions for %s\n",

			MAPS_ELF_SEC, obj->path);

		return -EINVAL;