Skip to content

Commit

Permalink
lib: bpf: Optimized variable usage in the btf_parse_elf function
Browse files Browse the repository at this point in the history
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 <kunyu@nfschina.com>
  • Loading branch information
likunyur authored and intel-lab-lkp committed Oct 8, 2022
1 parent 2e30960 commit 7426871
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions tools/lib/bpf/btf.c
Expand Up @@ -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;

Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 7426871

Please sign in to comment.