From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932952AbcHJSKK (ORCPT ); Wed, 10 Aug 2016 14:10:10 -0400 Received: from terminus.zytor.com ([198.137.202.10]:56552 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932417AbcHJSKF (ORCPT ); Wed, 10 Aug 2016 14:10:05 -0400 Date: Wed, 10 Aug 2016 11:08:42 -0700 From: tip-bot for Thomas Garnier Message-ID: Cc: thgarnie@google.com, peterz@infradead.org, dave.hansen@linux.intel.com, linux-kernel@vger.kernel.org, bhe@redhat.com, jroedel@suse.de, borntraeger@de.ibm.com, fabf@skynet.be, dyoung@redhat.com, lv.zheng@intel.com, luto@kernel.org, dan.j.williams@intel.com, tglx@linutronix.de, bp@alien8.de, aleksey.makarov@linaro.org, dvlasenk@redhat.com, msalter@redhat.com, toshi.kani@hp.com, mingo@kernel.org, keescook@chromium.org, torvalds@linux-foundation.org, brgerst@gmail.com, bp@suse.de, hpa@zytor.com, rafael.j.wysocki@intel.com, akpm@linux-foundation.org, jpoimboe@redhat.com Reply-To: aleksey.makarov@linaro.org, bp@alien8.de, dvlasenk@redhat.com, tglx@linutronix.de, dan.j.williams@intel.com, luto@kernel.org, lv.zheng@intel.com, dyoung@redhat.com, fabf@skynet.be, borntraeger@de.ibm.com, jroedel@suse.de, bhe@redhat.com, linux-kernel@vger.kernel.org, dave.hansen@linux.intel.com, peterz@infradead.org, thgarnie@google.com, jpoimboe@redhat.com, rafael.j.wysocki@intel.com, akpm@linux-foundation.org, hpa@zytor.com, bp@suse.de, keescook@chromium.org, brgerst@gmail.com, torvalds@linux-foundation.org, toshi.kani@hp.com, mingo@kernel.org, msalter@redhat.com In-Reply-To: <1470762665-88032-1-git-send-email-thgarnie@google.com> References: <1470762665-88032-1-git-send-email-thgarnie@google.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mm] x86/mm/KASLR: Fix physical memory calculation on KASLR memory randomization Git-Commit-ID: c7d2361f7524f365c1ae42f47880e3fa9efb2c2a 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: c7d2361f7524f365c1ae42f47880e3fa9efb2c2a Gitweb: http://git.kernel.org/tip/c7d2361f7524f365c1ae42f47880e3fa9efb2c2a Author: Thomas Garnier AuthorDate: Tue, 9 Aug 2016 10:11:04 -0700 Committer: Ingo Molnar CommitDate: Wed, 10 Aug 2016 14:45:19 +0200 x86/mm/KASLR: Fix physical memory calculation on KASLR memory randomization Initialize KASLR memory randomization after max_pfn is initialized. Also ensure the size is rounded up. It could create problems on machines with more than 1Tb of memory on certain random addresses. Signed-off-by: Thomas Garnier Cc: Aleksey Makarov Cc: Andrew Morton Cc: Andy Lutomirski Cc: Baoquan He Cc: Borislav Petkov Cc: Borislav Petkov Cc: Brian Gerst Cc: Christian Borntraeger Cc: Dan Williams Cc: Dave Hansen Cc: Dave Young Cc: Denys Vlasenko Cc: Fabian Frederick Cc: H. Peter Anvin Cc: Joerg Roedel Cc: Josh Poimboeuf Cc: Kees Cook Cc: Linus Torvalds Cc: Lv Zheng Cc: Mark Salter Cc: Peter Zijlstra Cc: Rafael J . Wysocki Cc: Thomas Gleixner Cc: Toshi Kani Cc: kernel-hardening@lists.openwall.com Fixes: 021182e52fe0 ("Enable KASLR for physical mapping memory regions") Link: http://lkml.kernel.org/r/1470762665-88032-1-git-send-email-thgarnie@google.com Signed-off-by: Ingo Molnar --- arch/x86/kernel/setup.c | 8 ++++++-- arch/x86/mm/kaslr.c | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 991b779..95cf31c 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -936,8 +936,6 @@ void __init setup_arch(char **cmdline_p) x86_init.oem.arch_setup(); - kernel_randomize_memory(); - iomem_resource.end = (1ULL << boot_cpu_data.x86_phys_bits) - 1; setup_memory_map(); parse_setup_data(); @@ -1055,6 +1053,12 @@ void __init setup_arch(char **cmdline_p) max_possible_pfn = max_pfn; + /* + * Define random base addresses for memory sections after max_pfn is + * defined and before each memory section base is used. + */ + kernel_randomize_memory(); + #ifdef CONFIG_X86_32 /* max_low_pfn get updated here */ find_low_pfn_range(); diff --git a/arch/x86/mm/kaslr.c b/arch/x86/mm/kaslr.c index 26dccd6..ec8654f 100644 --- a/arch/x86/mm/kaslr.c +++ b/arch/x86/mm/kaslr.c @@ -97,7 +97,7 @@ void __init kernel_randomize_memory(void) * add padding if needed (especially for memory hotplug support). */ BUG_ON(kaslr_regions[0].base != &page_offset_base); - memory_tb = ((max_pfn << PAGE_SHIFT) >> TB_SHIFT) + + memory_tb = DIV_ROUND_UP(max_pfn << PAGE_SHIFT, 1UL << TB_SHIFT) + CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING; /* Adapt phyiscal memory region size based on available memory */