Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1bb07833 authored by Russell King's avatar Russell King
Browse files

Merge branch 'fdpic' of http://git.linaro.org/people/nicolas.pitre/linux into devel-stable 

This series provides the needed changes to suport the ELF_FDPIC binary
format on ARM. Both MMU and non-MMU systems are supported. This format
has many advantages over the BFLT format used on MMU-less systems, such
as being real ELF that can be parsed by standard tools, can support
shared dynamic libs, etc.
parents 47624248 cdf38888

arch/arm/include/asm/elf.h

+14 −2
Original line number Diff line number Diff line
@@ -100,10 +100,15 @@ struct elf32_hdr; 
extern int elf_check_arch(const struct elf32_hdr *);

#define elf_check_arch elf_check_arch



#define ELFOSABI_ARM_FDPIC  65	/* ARM FDPIC platform */

#define elf_check_fdpic(x)  ((x)->e_ident[EI_OSABI] == ELFOSABI_ARM_FDPIC)

#define elf_check_const_displacement(x)  ((x)->e_flags & EF_ARM_PIC)

#define ELF_FDPIC_CORE_EFLAGS  0



#define vmcore_elf64_check_arch(x) (0)



extern int arm_elf_read_implies_exec(const struct elf32_hdr *, int);

#define elf_read_implies_exec(ex,stk) arm_elf_read_implies_exec(&(ex), stk)

extern int arm_elf_read_implies_exec(int);

#define elf_read_implies_exec(ex,stk) arm_elf_read_implies_exec(stk)



struct task_struct;

int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
@@ -120,6 +125,13 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs); 
   have no such handler.  */

#define ELF_PLAT_INIT(_r, load_addr)	(_r)->ARM_r0 = 0



#define ELF_FDPIC_PLAT_INIT(_r, _exec_map_addr, _interp_map_addr, dynamic_addr) \

	do { \

		(_r)->ARM_r7 = _exec_map_addr; \

		(_r)->ARM_r8 = _interp_map_addr; \

		(_r)->ARM_r9 = dynamic_addr; \

	} while(0)



extern void elf_set_personality(const struct elf32_hdr *);

#define SET_PERSONALITY(ex)	elf_set_personality(&(ex))

arch/arm/include/asm/mmu.h

+8 −0
Original line number Diff line number Diff line
@@ -14,6 +14,10 @@ typedef struct { 
#ifdef CONFIG_VDSO

	unsigned long	vdso;

#endif

#ifdef CONFIG_BINFMT_ELF_FDPIC

	unsigned long	exec_fdpic_loadmap;

	unsigned long	interp_fdpic_loadmap;

#endif

} mm_context_t;



#ifdef CONFIG_CPU_HAS_ASID
@@ -33,6 +37,10 @@ typedef struct { 
 */

typedef struct {

	unsigned long	end_brk;

#ifdef CONFIG_BINFMT_ELF_FDPIC

	unsigned long	exec_fdpic_loadmap;

	unsigned long	interp_fdpic_loadmap;

#endif

} mm_context_t;



#endif

arch/arm/include/asm/processor.h

+15 −7
Original line number Diff line number Diff line
@@ -47,15 +47,24 @@ struct thread_struct { 


#define INIT_THREAD  {	}



#ifdef CONFIG_MMU

#define nommu_start_thread(regs) do { } while (0)

#else

#define nommu_start_thread(regs) regs->ARM_r10 = current->mm->start_data

#endif



#define start_thread(regs,pc,sp)					\

({									\

	unsigned long r7, r8, r9;					\

									\

	if (IS_ENABLED(CONFIG_BINFMT_ELF_FDPIC)) {			\

		r7 = regs->ARM_r7;					\

		r8 = regs->ARM_r8;					\

		r9 = regs->ARM_r9;					\

	}								\

	memset(regs->uregs, 0, sizeof(regs->uregs));			\

	if (IS_ENABLED(CONFIG_BINFMT_ELF_FDPIC) &&			\

	    current->personality & FDPIC_FUNCPTRS) {			\

		regs->ARM_r7 = r7;					\

		regs->ARM_r8 = r8;					\

		regs->ARM_r9 = r9;					\

		regs->ARM_r10 = current->mm->start_data;		\

	} else if (!IS_ENABLED(CONFIG_MMU))				\

		regs->ARM_r10 = current->mm->start_data;		\

	if (current->personality & ADDR_LIMIT_32BIT)			\

		regs->ARM_cpsr = USR_MODE;				\

	else								\
@@ -65,7 +74,6 @@ struct thread_struct { 
	regs->ARM_cpsr |= PSR_ENDSTATE;					\

	regs->ARM_pc = pc & ~1;		/* pc */			\

	regs->ARM_sp = sp;		/* sp */			\

	nommu_start_thread(regs);					\

})



/* Forward declaration, a strange C thing */

arch/arm/include/asm/ucontext.h

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#define _ASMARM_UCONTEXT_H



#include <asm/fpstate.h>

#include <asm/user.h>



/*

 * struct sigcontext only has room for the basic registers, but struct

arch/arm/include/uapi/asm/ptrace.h

+4 −0
Original line number Diff line number Diff line
@@ -31,6 +31,10 @@ 
#define PTRACE_SETVFPREGS	28

#define PTRACE_GETHBPREGS	29

#define PTRACE_SETHBPREGS	30

#define PTRACE_GETFDPIC		31



#define PTRACE_GETFDPIC_EXEC	0

#define PTRACE_GETFDPIC_INTERP	1



/*

 * PSR bits