From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753728AbdHNP6M (ORCPT ); Mon, 14 Aug 2017 11:58:12 -0400 Received: from mga09.intel.com ([134.134.136.24]:49250 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753556AbdHNP6K (ORCPT ); Mon, 14 Aug 2017 11:58:10 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.41,373,1498546800"; d="scan'208";a="1162474557" From: "Kirill A. Shutemov" To: Linus Torvalds , x86@kernel.org, Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" Cc: Andrew Morton , Andy Lutomirski , Dmitry Safonov , Cyrill Gorcunov , Borislav Petkov , linux-mm@kvack.org, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" , stable Subject: [PATCH] x86/mm: Fix personality(ADDR_NO_RANDOMIZE) Date: Mon, 14 Aug 2017 18:57:19 +0300 Message-Id: <20170814155719.74839-1-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.14.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In v4.12, during rework of infrastructure around mmap_base, disable-ASLR personality flag got accidentally broken. Let's make it work again. Signed-off-by: Kirill A. Shutemov Fixes: 1b028f784e8c ("x86/mm: Introduce mmap_compat_base() for 32-bit mmap()") Cc: stable [4.12+] --- arch/x86/mm/mmap.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c index 229d04a83f85..779bdbe5e424 100644 --- a/arch/x86/mm/mmap.c +++ b/arch/x86/mm/mmap.c @@ -127,6 +127,8 @@ static unsigned long mmap_legacy_base(unsigned long rnd, static void arch_pick_mmap_base(unsigned long *base, unsigned long *legacy_base, unsigned long random_factor, unsigned long task_size) { + if (!(current->flags & PF_RANDOMIZE)) + random_factor = 0; *legacy_base = mmap_legacy_base(random_factor, task_size); if (mmap_is_legacy()) *base = *legacy_base; -- 2.14.1