system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-07-22 11:10:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

binfmt_elf: simplify error handling in load_elf_phdrs()

Browse source 
The err variable was the same like retval, but capped to <= 0. This is the
same as retval as elf_read() never returns positive values.

Signed-off-by: Rolf Eike Beer <eb@emlix.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/4137126.7Qn9TF0dmF@mobilepool36.emlix.com
This commit is contained in:
Rolf Eike Beer 2022-10-19 09:52:16 +02:00 committed by Kees Cook
parent cfc46ca4fd
commit ef20c5139c
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
fs/binfmt_elf.c
View file

@ -462,7 +462,7 @@ static struct elf_phdr *load_elf_phdrs(const struct elfhdr *elf_ex,
struct file *elf_file)
{
struct elf_phdr *elf_phdata = NULL;
int retval, err = -1;
int retval = -1;
unsigned int size;
/*
@ -484,15 +484,9 @@ static struct elf_phdr *load_elf_phdrs(const struct elfhdr *elf_ex,
/* Read in the program headers */
retval = elf_read(elf_file, elf_phdata, size, elf_ex->e_phoff);
if (retval < 0) {
err = retval;
goto out;
}
/* Success! */
err = 0;
out:
if (err) {
if (retval) {
kfree(elf_phdata);
elf_phdata = NULL;
}