From ece840ae37959a1851f977cd3511cf8390517ee8 Mon Sep 17 00:00:00 2001 From: Ksawlii Date: Fri, 13 Dec 2024 19:44:19 +0100 Subject: [PATCH] Revert "arm64: determine stack entropy based on mmap entropy" This reverts commit df64e52e41dff17b1e00358dc0876fcb5124f89f. --- arch/arm64/include/asm/elf.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h index 4ef07735c..e3a6475d6 100755 --- a/arch/arm64/include/asm/elf.h +++ b/arch/arm64/include/asm/elf.h @@ -193,10 +193,10 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm, /* 1GB of VA */ #ifdef CONFIG_COMPAT #define STACK_RND_MASK (test_thread_flag(TIF_32BIT) ? \ - ((1UL << mmap_rnd_compat_bits) - 1) >> (PAGE_SHIFT - 12) : \ - ((1UL << mmap_rnd_bits) - 1) >> (PAGE_SHIFT - 12)) + 0x7ff >> (PAGE_SHIFT - 12) : \ + 0x3ffff >> (PAGE_SHIFT - 12)) #else -#define STACK_RND_MASK (((1UL << mmap_rnd_bits) - 1) >> (PAGE_SHIFT - 12)) +#define STACK_RND_MASK (0x3ffff >> (PAGE_SHIFT - 12)) #endif #ifdef __AARCH64EB__