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

Commit 204db6ed authored by Kees Cook's avatar Kees Cook Committed by Linus Torvalds
Browse files

mm: fold arch_randomize_brk into ARCH_HAS_ELF_RANDOMIZE 



The arch_randomize_brk() function is used on several architectures,
even those that don't support ET_DYN ASLR. To avoid bulky extern/#define
tricks, consolidate the support under CONFIG_ARCH_HAS_ELF_RANDOMIZE for
the architectures that support it, while still handling CONFIG_COMPAT_BRK.

Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Cc: Hector Marco-Gisbert <hecmargi@upv.es>
Cc: Russell King <linux@arm.linux.org.uk>
Reviewed-by: default avatarIngo Molnar <mingo@kernel.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Andrey Ryabinin <a.ryabinin@samsung.com>
Cc: Arun Chandran <achandran@mvista.com>
Cc: Yann Droneaud <ydroneaud@opteya.com>
Cc: Min-Hua Chen <orca.chen@gmail.com>
Cc: Paul Burton <paul.burton@imgtec.com>
Cc: Alex Smith <alex@alex-smith.me.uk>
Cc: Markos Chandras <markos.chandras@imgtec.com>
Cc: Vineeth Vijayan <vvijayan@mvista.com>
Cc: Jeff Bailey <jeffbailey@google.com>
Cc: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Cc: Ben Hutchings <ben@decadent.org.uk>
Cc: Behan Webster <behanw@converseincode.com>
Cc: Ismael Ripoll <iripoll@upv.es>
Cc: Jan-Simon Mller <dl9pf@gmx.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d1fd836d

arch/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -497,6 +497,7 @@ config ARCH_HAS_ELF_RANDOMIZE 
	  An architecture supports choosing randomized locations for

	  stack, mmap, brk, and ET_DYN. Defined functions:

	  - arch_mmap_rnd()

	  - arch_randomize_brk()



#

# ABI hall of shame

arch/arm/include/asm/elf.h

+0 −4
Original line number Diff line number Diff line
@@ -125,10 +125,6 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs); 
extern void elf_set_personality(const struct elf32_hdr *);

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



struct mm_struct;

extern unsigned long arch_randomize_brk(struct mm_struct *mm);

#define arch_randomize_brk arch_randomize_brk



#ifdef CONFIG_MMU

#define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1

struct linux_binprm;

arch/arm64/include/asm/elf.h

+0 −4
Original line number Diff line number Diff line
@@ -156,10 +156,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm, 
#define STACK_RND_MASK			(0x3ffff >> (PAGE_SHIFT - 12))

#endif



struct mm_struct;

extern unsigned long arch_randomize_brk(struct mm_struct *mm);

#define arch_randomize_brk arch_randomize_brk



#ifdef CONFIG_COMPAT



#ifdef __AARCH64EB__

arch/mips/include/asm/elf.h

+0 −4
Original line number Diff line number Diff line
@@ -410,10 +410,6 @@ struct linux_binprm; 
extern int arch_setup_additional_pages(struct linux_binprm *bprm,

				       int uses_interp);



struct mm_struct;

extern unsigned long arch_randomize_brk(struct mm_struct *mm);

#define arch_randomize_brk arch_randomize_brk



struct arch_elf_state {

	int fp_abi;

	int interp_fp_abi;

arch/powerpc/include/asm/elf.h

+0 −4
Original line number Diff line number Diff line
@@ -128,10 +128,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm, 
	(0x7ff >> (PAGE_SHIFT - 12)) : \

	(0x3ffff >> (PAGE_SHIFT - 12)))



extern unsigned long arch_randomize_brk(struct mm_struct *mm);

#define arch_randomize_brk arch_randomize_brk





#ifdef CONFIG_SPU_BASE

/* Notes used in ET_CORE. Note name is "SPU/<fd>/<filename>". */

#define NT_SPU		1