binfmt_elf: simplify error handling in load_elf_phdrs()
Subsystems (3)
PATCH 1/1 binfmt_elf: simplify error handling in load_elf_phdrs()
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 <[email protected]>
--- fs/binfmt_elf.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
fs/binfmt_elf.c +2 -8
@@ -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 ; }
Signature · 10 lines
2.37.3 -- Rolf Eike Beer, emlix GmbH, https://www.emlix.com Fon +49 551 30664-0, Fax +49 551 30664-11 Gothaer Platz 3, 37083 Göttingen, Germany Sitz der Gesellschaft: Göttingen, Amtsgericht Göttingen HR B 3160 Geschäftsführung: Heike Jordan, Dr. Uwe Kracke – Ust-IdNr.: DE 205 198 055 emlix - smart embedded open source
Kees Cook
AppliedQuoted 2 lines · Rolf Eike Beer
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.
Applied to for-next/execve, thanks!
[1/1] binfmt_elf: simplify error handling in load_elf_phdrs()
https://git.kernel.org/kees/c/ef20c5139c31
Signature · 1 line
Kees Cook