Unverified Commit ed8ec0de authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!15367 libbpf: Fix segfault due to libelf functions not setting errno 

Merge Pull Request from: @ci-robot 
 
PR sync from: Xiaomeng Zhang <zhangxiaomeng13@huawei.com>
https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/AWBAMZYPMAARFKFESXJSTQ44UWIRWBNZ/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBR43L 
 
Link:https://gitee.com/openeuler/kernel/pulls/15367

 

Reviewed-by: default avatarYe Weihua <yeweihua4@huawei.com>
Reviewed-by: default avatarXu Kuohai <xukuohai@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 8d6da475 2e0b0602

tools/lib/bpf/linker.c

+8 −14
Original line number Diff line number Diff line
@@ -567,17 +567,15 @@ static int linker_load_obj_file(struct bpf_linker *linker, const char *filename, 
	}

	obj->elf = elf_begin(obj->fd, ELF_C_READ_MMAP, NULL);

	if (!obj->elf) {

		err = -errno;

		pr_warn_elf("failed to parse ELF file '%s'", filename);

		return err;

		return -EINVAL;

	}



	/* Sanity check ELF file high-level properties */

	ehdr = elf64_getehdr(obj->elf);

	if (!ehdr) {

		err = -errno;

		pr_warn_elf("failed to get ELF header for %s", filename);

		return err;

		return -EINVAL;

	}

	if (ehdr->e_ident[EI_DATA] != host_endianness) {

		err = -EOPNOTSUPP;
@@ -593,9 +591,8 @@ static int linker_load_obj_file(struct bpf_linker *linker, const char *filename, 
	}



	if (elf_getshdrstrndx(obj->elf, &obj->shstrs_sec_idx)) {

		err = -errno;

		pr_warn_elf("failed to get SHSTRTAB section index for %s", filename);

		return err;

		return -EINVAL;

	}



	scn = NULL;
@@ -605,26 +602,23 @@ static int linker_load_obj_file(struct bpf_linker *linker, const char *filename, 


		shdr = elf64_getshdr(scn);

		if (!shdr) {

			err = -errno;

			pr_warn_elf("failed to get section #%zu header for %s",

				    sec_idx, filename);

			return err;

			return -EINVAL;

		}



		sec_name = elf_strptr(obj->elf, obj->shstrs_sec_idx, shdr->sh_name);

		if (!sec_name) {

			err = -errno;

			pr_warn_elf("failed to get section #%zu name for %s",

				    sec_idx, filename);

			return err;

			return -EINVAL;

		}



		data = elf_getdata(scn, 0);

		if (!data) {

			err = -errno;

			pr_warn_elf("failed to get section #%zu (%s) data from %s",

				    sec_idx, sec_name, filename);

			return err;

			return -EINVAL;

		}



		sec = add_src_sec(obj, sec_name);
@@ -2602,14 +2596,14 @@ int bpf_linker__finalize(struct bpf_linker *linker) 


	/* Finalize ELF layout */

	if (elf_update(linker->elf, ELF_C_NULL) < 0) {

		err = -errno;

		err = -EINVAL;

		pr_warn_elf("failed to finalize ELF layout");

		return libbpf_err(err);

	}



	/* Write out final ELF contents */

	if (elf_update(linker->elf, ELF_C_WRITE) < 0) {

		err = -errno;

		err = -EINVAL;

		pr_warn_elf("failed to write ELF contents");

		return libbpf_err(err);

	}