From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:56738 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753313AbdHTTBY (ORCPT ); Sun, 20 Aug 2017 15:01:24 -0400 Subject: Patch "x86/elf: Remove the unnecessary ADDR_NO_RANDOMIZE checks" has been added to the 4.12-stable tree To: oleg@redhat.com, akpm@linux-foundation.org, bp@suse.de, dsafonov@virtuozzo.com, gregkh@linuxfoundation.org, kirill.shutemov@linux.intel.com, luto@amacapital.net, tglx@linutronix.de, torvalds@linux-foundation.org Cc: , From: Date: Sun, 20 Aug 2017 12:01:20 -0700 Message-ID: <15032556806554@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled x86/elf: Remove the unnecessary ADDR_NO_RANDOMIZE checks to the 4.12-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: x86-elf-remove-the-unnecessary-addr_no_randomize-checks.patch and it can be found in the queue-4.12 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 01578e36163cdd0e4fd61d9976de15f13364e26d Mon Sep 17 00:00:00 2001 From: Oleg Nesterov Date: Tue, 15 Aug 2017 17:40:11 +0200 Subject: x86/elf: Remove the unnecessary ADDR_NO_RANDOMIZE checks From: Oleg Nesterov commit 01578e36163cdd0e4fd61d9976de15f13364e26d upstream. 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 Signed-off-by: Thomas Gleixner Reviewed-by: Dmitry Safonov Cc: Andy Lutomirski Cc: Andrew Morton Cc: Borislav Petkov Cc: Linus Torvalds Cc: "Kirill A. Shutemov" Link: http://lkml.kernel.org/r/20170815154011.GB1076@redhat.com Signed-off-by: Greg Kroah-Hartman --- arch/x86/mm/mmap.c | 3 +-- fs/binfmt_elf.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) --- 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; } --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -666,8 +666,7 @@ static unsigned long randomize_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; Patches currently in stable-queue which might be from oleg@redhat.com are queue-4.12/x86-elf-remove-the-unnecessary-addr_no_randomize-checks.patch queue-4.12/mm-fix-double-mmap_sem-unlock-on-mmf_unstable-enforced-sigbus.patch queue-4.12/x86-fix-norandmaps-addr_no_randomize.patch