From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752514AbdHPSjf (ORCPT ); Wed, 16 Aug 2017 14:39:35 -0400 Received: from terminus.zytor.com ([65.50.211.136]:52673 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752368AbdHPSjd (ORCPT ); Wed, 16 Aug 2017 14:39:33 -0400 Date: Wed, 16 Aug 2017 11:37:14 -0700 From: tip-bot for Oleg Nesterov Message-ID: Cc: hpa@zytor.com, tglx@linutronix.de, luto@amacapital.net, dsafonov@virtuozzo.com, linux-kernel@vger.kernel.org, akpm@linux-foundation.org, torvalds@linux-foundation.org, oleg@redhat.com, mingo@kernel.org, kirill.shutemov@linux.intel.com, bp@suse.de Reply-To: luto@amacapital.net, tglx@linutronix.de, hpa@zytor.com, bp@suse.de, mingo@kernel.org, oleg@redhat.com, kirill.shutemov@linux.intel.com, akpm@linux-foundation.org, torvalds@linux-foundation.org, dsafonov@virtuozzo.com, linux-kernel@vger.kernel.org In-Reply-To: <20170815154011.GB1076@redhat.com> References: <20170815154011.GB1076@redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/elf: Remove the unnecessary ADDR_NO_RANDOMIZE checks Git-Commit-ID: 01578e36163cdd0e4fd61d9976de15f13364e26d X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 01578e36163cdd0e4fd61d9976de15f13364e26d Gitweb: http://git.kernel.org/tip/01578e36163cdd0e4fd61d9976de15f13364e26d Author: Oleg Nesterov AuthorDate: Tue, 15 Aug 2017 17:40:11 +0200 Committer: Thomas Gleixner 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 Signed-off-by: Thomas Gleixner Reviewed-by: Dmitry Safonov Cc: stable@vger.kernel.org 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 --- 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;