binfmt_elf: fix documented return value for load_elf_phdrs()
Subsystems (2)
PATCH 1/1 binfmt_elf: fix documented return value for load_elf_phdrs()
This function has never returned anything but a plain NULL.
Fixes 6a8d38945cf4e6e819d6b550250615db763065a0
Signed-off-by Rolf Eike Beer <[email protected]>
--- fs/binfmt_elf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/binfmt_elf.c +1 -1
@@ -428,7 +428,7 @@ static int elf_read(struct file *file, void *buf, size_t len, loff_t pos)* * Loads ELF program headers from the binary file elf_file, which has the ELF * header pointed to by elf_ex, into a newly allocated array. The caller is -* responsible for freeing the allocated data. Returns an ERR_PTR upon failure. +* responsible for freeing the allocated data. Returns NULL upon failure. */ static struct elf_phdr *load_elf_phdrs (const struct elfhdr *elf_ex,struct file *elf_file)
Signature · 11 lines
2.28.0 -- Rolf Eike Beer, emlix GmbH, http://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
binfmt_elf: simplify error handling in load_elf_phdrs()
--- fs/binfmt_elf.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
fs/binfmt_elf.c +2 -8
@@ -434,7 +434,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;/*
@@ -456,15 +456,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 · 11 lines
2.28.0 -- Rolf Eike Beer, emlix GmbH, http://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