p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fs/binfmt_elf.c: delete unused "interp_map_addr" argument 

Link: http://lkml.kernel.org/r/20191005165049.GA26927@avx2
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Alexey Dobriyan 2019-12-04 16:52:22 -08:00 committed by Linus Torvalds
parent f2728fe80c
commit 81696d5d54
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fs/binfmt_elf.c
View File

@ -544,7 +544,7 @@ static inline int make_prot(u32 p_flags)
an ELF header */ an ELF header */
static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex, static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
struct file *interpreter, unsigned long *interp_map_addr, struct file *interpreter,
unsigned long no_base, struct elf_phdr *interp_elf_phdata) unsigned long no_base, struct elf_phdr *interp_elf_phdata)
{ {
struct elf_phdr *eppnt; struct elf_phdr *eppnt;
@ -590,8 +590,6 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
map_addr = elf_map(interpreter, load_addr + vaddr, map_addr = elf_map(interpreter, load_addr + vaddr,
eppnt, elf_prot, elf_type, total_size); eppnt, elf_prot, elf_type, total_size);
total_size = 0; total_size = 0;
if (!*interp_map_addr)
*interp_map_addr = map_addr;
error = map_addr; error = map_addr;
if (BAD_ADDR(map_addr)) if (BAD_ADDR(map_addr))
goto out; goto out;
@ -1054,11 +1052,8 @@ static int load_elf_binary(struct linux_binprm *bprm)
} }
if (interpreter) { if (interpreter) {
unsigned long interp_map_addr = 0;
elf_entry = load_elf_interp(&loc->interp_elf_ex, elf_entry = load_elf_interp(&loc->interp_elf_ex,
interpreter, interpreter,
&interp_map_addr,
load_bias, interp_elf_phdata); load_bias, interp_elf_phdata);
if (!IS_ERR((void *)elf_entry)) { if (!IS_ERR((void *)elf_entry)) {
/* /*