Commit-ID: 01578e36163cdd0e4fd61d9976de15f13364e26d Gitweb: http://git.kernel.org/tip/01578e36163cdd0e4fd61d9976de15f13364e26d Author: Oleg Nesterov <o...@redhat.com> AuthorDate: Tue, 15 Aug 2017 17:40:11 +0200 Committer: Thomas Gleixner <t...@linutronix.de> CommitDate: Wed, 16 Aug 2017 20:32:02 +0200
x86/elf: Remove the unnecessary ADDR_NO_RANDOMIZE checks The ADDR_NO_RANDOMIZE checks in stack_maxrandom_size() and randomize_stack_top() are not required. PF_RANDOMIZE is set by load_elf_binary() only if ADDR_NO_RANDOMIZE is not set, no need to re-check after that. Signed-off-by: Oleg Nesterov <o...@redhat.com> Signed-off-by: Thomas Gleixner <t...@linutronix.de> Reviewed-by: Dmitry Safonov <dsafo...@virtuozzo.com> Cc: sta...@vger.kernel.org Cc: Andy Lutomirski <l...@amacapital.net> Cc: Andrew Morton <a...@linux-foundation.org> Cc: Borislav Petkov <b...@suse.de> Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: "Kirill A. Shutemov" <kirill.shute...@linux.intel.com> Link: http://lkml.kernel.org/r/20170815154011.gb1...@redhat.com --- arch/x86/mm/mmap.c | 3 +-- fs/binfmt_elf.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c index c94df12..a88cfbf 100644 --- a/arch/x86/mm/mmap.c +++ b/arch/x86/mm/mmap.c @@ -50,8 +50,7 @@ unsigned long tasksize_64bit(void) static unsigned long stack_maxrandom_size(unsigned long task_size) { unsigned long max = 0; - if ((current->flags & PF_RANDOMIZE) && - !(current->personality & ADDR_NO_RANDOMIZE)) { + if (current->flags & PF_RANDOMIZE) { max = (-1UL) & __STACK_RND_MASK(task_size == tasksize_32bit()); max <<= PAGE_SHIFT; } diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index 879ff9c..6466153 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -664,8 +664,7 @@ static unsigned long randomize_stack_top(unsigned long stack_top) { unsigned long random_variable = 0; - if ((current->flags & PF_RANDOMIZE) && - !(current->personality & ADDR_NO_RANDOMIZE)) { + if (current->flags & PF_RANDOMIZE) { random_variable = get_random_long(); random_variable &= STACK_RND_MASK; random_variable <<= PAGE_SHIFT;
