Content-Type: multipart/mixed; boundary="===============9179103612436509709==" MIME-Version: 1.0 From: Li kunyu To: kbuild-all@lists.01.org Subject: [PATCH] lib: bpf: Optimized variable usage in the btf_parse_elf function Date: Sun, 09 Oct 2022 15:08:28 +0800 Message-ID: <20221009070827.525694-2-kunyu@nfschina.com> In-Reply-To: <202210082050.nPzAbV1v-lkp@intel.com> List-Id: --===============9179103612436509709== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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 2d14f1a52d7a..fa9d5fa03da4 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, st= ruct btf *base_btf, struct btf_ext **btf_ext) { Elf_Data *btf_data =3D NULL, *btf_ext_data =3D NULL; - int err =3D 0, fd =3D -1, idx =3D 0; + int err, fd, idx =3D 0; struct btf *btf =3D NULL; - Elf_Scn *scn =3D NULL; - Elf *elf =3D 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, stru= ct btf *base_btf, = fd =3D open(path, O_RDONLY | O_CLOEXEC); if (fd < 0) { - err =3D -errno; pr_warn("failed to open %s: %s\n", path, strerror(errno)); - return ERR_PTR(err); + return ERR_PTR(-errno); } = err =3D -LIBBPF_ERRNO__FORMAT; @@ -987,8 +986,6 @@ static struct btf *btf_parse_elf(const char *path, stru= ct btf *base_btf, } } = - err =3D 0; - if (!btf_data) { err =3D -ENOENT; goto done; -- = 2.18.2 --===============9179103612436509709==--