Commit eb4bc076 authored by Maciej W. Rozycki's avatar Maciej W. Rozycki Committed by Ralf Baechle
Browse files

ELF: Also pass any interpreter's file header to `arch_check_elf' 



Also pass any interpreter's file header to `arch_check_elf' so that any
architecture handler can have a look at it if needed.

Signed-off-by: default avatarMaciej W. Rozycki <macro@imgtec.com>
Acked-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Acked-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Cc: Matthew Fortune <Matthew.Fortune@imgtec.com>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/11478/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 90d53a91

arch/mips/include/asm/elf.h

+1 −1
Original line number Diff line number Diff line
@@ -448,7 +448,7 @@ struct arch_elf_state { 
extern int arch_elf_pt_proc(void *ehdr, void *phdr, struct file *elf,

			    bool is_interp, struct arch_elf_state *state);



extern int arch_check_elf(void *ehdr, bool has_interpreter,

extern int arch_check_elf(void *ehdr, bool has_interpreter, void *interp_ehdr,

			  struct arch_elf_state *state);



extern void mips_set_personality_fp(struct arch_elf_state *state);

arch/mips/kernel/elf.c

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ int arch_elf_pt_proc(void *_ehdr, void *_phdr, struct file *elf, 
	return 0;

}



int arch_check_elf(void *_ehdr, bool has_interpreter,

int arch_check_elf(void *_ehdr, bool has_interpreter, void *_interp_ehdr,

		   struct arch_elf_state *state)

{

	union {

fs/binfmt_elf.c

+5 −1
Original line number Diff line number Diff line
@@ -491,6 +491,7 @@ static inline int arch_elf_pt_proc(struct elfhdr *ehdr, 
 * arch_check_elf() - check an ELF executable

 * @ehdr:	The main ELF header

 * @has_interp:	True if the ELF has an interpreter, else false.

 * @interp_ehdr: The interpreter's ELF header

 * @state:	Architecture-specific state preserved throughout the process

 *		of loading the ELF.

 *
@@ -502,6 +503,7 @@ static inline int arch_elf_pt_proc(struct elfhdr *ehdr, 
 *         with that return code.

 */

static inline int arch_check_elf(struct elfhdr *ehdr, bool has_interp,

				 struct elfhdr *interp_ehdr,

				 struct arch_elf_state *state)

{

	/* Dummy implementation, always proceed */
@@ -829,7 +831,9 @@ static int load_elf_binary(struct linux_binprm *bprm) 
	 * still possible to return an error to the code that invoked

	 * the exec syscall.

	 */

	retval = arch_check_elf(&loc->elf_ex, !!interpreter, &arch_state);

	retval = arch_check_elf(&loc->elf_ex,

				!!interpreter, &loc->interp_elf_ex,

				&arch_state);

	if (retval)

		goto out_free_dentry;

CRA Git | Maintained and supported by SUSTech CRA and CCSE