From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753577AbcDSJcy (ORCPT ); Tue, 19 Apr 2016 05:32:54 -0400 Received: from terminus.zytor.com ([198.137.202.10]:56324 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753028AbcDSJcw (ORCPT ); Tue, 19 Apr 2016 05:32:52 -0400 Date: Tue, 19 Apr 2016 02:31:39 -0700 From: tip-bot for Yinghai Lu Message-ID: Cc: yinghai@kernel.org, linux-kernel@vger.kernel.org, dvyukov@google.com, torvalds@linux-foundation.org, keescook@chromium.org, luto@kernel.org, bp@suse.de, tglx@linutronix.de, mingo@kernel.org, aryabinin@virtuozzo.com, dvlasenk@redhat.com, akpm@linux-foundation.org, hpa@zytor.com, peterz@infradead.org, brgerst@gmail.com, luto@amacapital.net, hjl.tools@gmail.com, bhe@redhat.com, jpoimboe@redhat.com, bp@alien8.de Reply-To: bhe@redhat.com, jpoimboe@redhat.com, bp@alien8.de, luto@amacapital.net, hjl.tools@gmail.com, akpm@linux-foundation.org, hpa@zytor.com, peterz@infradead.org, brgerst@gmail.com, dvlasenk@redhat.com, tglx@linutronix.de, mingo@kernel.org, aryabinin@virtuozzo.com, bp@suse.de, torvalds@linux-foundation.org, keescook@chromium.org, luto@kernel.org, yinghai@kernel.org, linux-kernel@vger.kernel.org, dvyukov@google.com In-Reply-To: <1460997735-24785-3-git-send-email-keescook@chromium.org> References: <1460997735-24785-3-git-send-email-keescook@chromium.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/boot] x86/KASLR: Remove unneeded boot_params argument Git-Commit-ID: 206f25a8319b312b9983953a308b0e38e1943c1c 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: 206f25a8319b312b9983953a308b0e38e1943c1c Gitweb: http://git.kernel.org/tip/206f25a8319b312b9983953a308b0e38e1943c1c Author: Yinghai Lu AuthorDate: Mon, 18 Apr 2016 09:42:11 -0700 Committer: Ingo Molnar CommitDate: Tue, 19 Apr 2016 10:30:50 +0200 x86/KASLR: Remove unneeded boot_params argument Since the boot_params can be found using the real_mode global variable, there is no need to pass around a pointer to it. This slightly simplifies the choose_kernel_location function and its callers. [kees: rewrote changelog, tracked file rename] Signed-off-by: Yinghai Lu Signed-off-by: Kees Cook Cc: Andrew Morton Cc: Andrey Ryabinin Cc: Andy Lutomirski Cc: Andy Lutomirski Cc: Baoquan He Cc: Borislav Petkov Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: Dmitry Vyukov Cc: H. Peter Anvin Cc: H.J. Lu Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1460997735-24785-3-git-send-email-keescook@chromium.org Signed-off-by: Ingo Molnar --- arch/x86/boot/compressed/kaslr.c | 5 ++--- arch/x86/boot/compressed/misc.c | 2 +- arch/x86/boot/compressed/misc.h | 6 ++---- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/arch/x86/boot/compressed/kaslr.c b/arch/x86/boot/compressed/kaslr.c index 6a9b96b..622aa88 100644 --- a/arch/x86/boot/compressed/kaslr.c +++ b/arch/x86/boot/compressed/kaslr.c @@ -295,8 +295,7 @@ static unsigned long find_random_addr(unsigned long minimum, return slots_fetch_random(); } -unsigned char *choose_kernel_location(struct boot_params *boot_params, - unsigned char *input, +unsigned char *choose_kernel_location(unsigned char *input, unsigned long input_size, unsigned char *output, unsigned long output_size) @@ -316,7 +315,7 @@ unsigned char *choose_kernel_location(struct boot_params *boot_params, } #endif - boot_params->hdr.loadflags |= KASLR_FLAG; + real_mode->hdr.loadflags |= KASLR_FLAG; /* Record the various known unsafe memory ranges. */ mem_avoid_init((unsigned long)input, input_size, diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c index 79dac17..f35ad9e 100644 --- a/arch/x86/boot/compressed/misc.c +++ b/arch/x86/boot/compressed/misc.c @@ -428,7 +428,7 @@ asmlinkage __visible void *decompress_kernel(void *rmode, memptr heap, * the entire decompressed kernel plus relocation table, or the * entire decompressed kernel plus .bss and .brk sections. */ - output = choose_kernel_location(real_mode, input_data, input_len, output, + output = choose_kernel_location(input_data, input_len, output, output_len > run_size ? output_len : run_size); diff --git a/arch/x86/boot/compressed/misc.h b/arch/x86/boot/compressed/misc.h index a8c4e08..22346d5 100644 --- a/arch/x86/boot/compressed/misc.h +++ b/arch/x86/boot/compressed/misc.h @@ -67,8 +67,7 @@ int cmdline_find_option_bool(const char *option); #if CONFIG_RANDOMIZE_BASE /* kaslr.c */ -unsigned char *choose_kernel_location(struct boot_params *boot_params, - unsigned char *input, +unsigned char *choose_kernel_location(unsigned char *input, unsigned long input_size, unsigned char *output, unsigned long output_size); @@ -76,8 +75,7 @@ unsigned char *choose_kernel_location(struct boot_params *boot_params, bool has_cpuflag(int flag); #else static inline -unsigned char *choose_kernel_location(struct boot_params *boot_params, - unsigned char *input, +unsigned char *choose_kernel_location(unsigned char *input, unsigned long input_size, unsigned char *output, unsigned long output_size)