From 74268712be9dbfe27fbf4d9b313f88e3f7e7cf0f Mon Sep 17 00:00:00 2001 From: Li kunyu Date: Sat, 8 Oct 2022 16:21:00 +0800 Subject: [PATCH] lib: bpf: Optimized variable usage in the btf_parse_elf function The following changes were made in the btf_parse_elf function: 1. The initialization assignments of err, fd, scn and elf variables are removed, and they do not affect function security after analysis. 2. Remove unnecessary assignments to err variable (-error). Signed-off-by: Li kunyu --- tools/lib/bpf/btf.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/tools/lib/bpf/btf.c b/tools/lib/bpf/btf.c index d88647da2c7fc5..da9cacb35e354f 100644 --- a/tools/lib/bpf/btf.c +++ b/tools/lib/bpf/btf.c @@ -910,10 +910,10 @@ static struct btf *btf_parse_elf(const char *path, struct btf *base_btf, struct btf_ext **btf_ext) { Elf_Data *btf_data = NULL, *btf_ext_data = NULL; - int err = 0, fd = -1, idx = 0; + int err, fd, idx = 0; struct btf *btf = NULL; - Elf_Scn *scn = NULL; - Elf *elf = NULL; + Elf_Scn *scn; + Elf *elf; GElf_Ehdr ehdr; size_t shstrndx; @@ -924,9 +924,8 @@ static struct btf *btf_parse_elf(const char *path, struct btf *base_btf, fd = open(path, O_RDONLY | O_CLOEXEC); if (fd < 0) { - err = -errno; pr_warn("failed to open %s: %s\n", path, strerror(errno)); - return ERR_PTR(err); + return ERR_PTR(-errno); } err = -LIBBPF_ERRNO__FORMAT; @@ -987,8 +986,6 @@ static struct btf *btf_parse_elf(const char *path, struct btf *base_btf, } } - err = 0; - if (!btf_data) { err = -ENOENT; goto done;