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

Commit c93365f3 authored by Kees Cook's avatar Kees Cook Committed by Alexander Alexeev
Browse files

mm: split ET_DYN ASLR from mmap ASLR 



This moves arch_mmap_rnd() into the ELF loader for handling ET_DYN ASLR
in a separate region from mmap ASLR, as already done on s390. Removes
CONFIG_BINFMT_ELF_RANDOMIZE_PIE.

Reported-by: default avatarHector Marco-Gisbert <hecmargi@upv.es>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
parent c2d810c0

arch/arm/Kconfig

+0 −1
Original line number Diff line number Diff line 
config ARM

	bool

	default y

	select ARCH_BINFMT_ELF_RANDOMIZE_PIE

	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE

	select ARCH_HAVE_CUSTOM_GPIO_H

	select ARCH_SUPPORTS_ATOMIC_RMW

arch/arm64/Kconfig

+0 −1
Original line number Diff line number Diff line 
config ARM64

	def_bool y

	select ARCH_BINFMT_ELF_RANDOMIZE_PIE

	select ARCH_HAS_ELF_RANDOMIZE

	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE

#	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST

arch/mips/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ config MIPS 
	select HAVE_KPROBES

	select HAVE_KRETPROBES

	select HAVE_DEBUG_KMEMLEAK

	select ARCH_BINFMT_ELF_RANDOMIZE_PIE

	select HAVE_ARCH_TRANSPARENT_HUGEPAGE if CPU_SUPPORTS_HUGEPAGES && 64BIT

	select RTC_LIB if !MACH_LOONGSON

	select GENERIC_ATOMIC64 if !64BIT

arch/x86/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ config X86 
	select HAVE_CMPXCHG_DOUBLE

	select HAVE_ARCH_KMEMCHECK

	select HAVE_USER_RETURN_NOTIFIER

	select ARCH_BINFMT_ELF_RANDOMIZE_PIE

	select HAVE_ARCH_JUMP_LABEL

	select HAVE_TEXT_POKE_SMP

	select HAVE_GENERIC_HARDIRQS

fs/Kconfig.binfmt

+0 −3
Original line number Diff line number Diff line
@@ -27,9 +27,6 @@ config COMPAT_BINFMT_ELF 
	bool

	depends on COMPAT && BINFMT_ELF



config ARCH_BINFMT_ELF_RANDOMIZE_PIE

	bool



config BINFMT_ELF_FDPIC

	bool "Kernel support for FDPIC ELF binaries"

	default y