From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933160AbbGGU6G (ORCPT ); Tue, 7 Jul 2015 16:58:06 -0400 Received: from mail-ig0-f170.google.com ([209.85.213.170]:37742 "EHLO mail-ig0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932630AbbGGU55 (ORCPT ); Tue, 7 Jul 2015 16:57:57 -0400 MIME-Version: 1.0 In-Reply-To: <1436300428-21163-2-git-send-email-yinghai@kernel.org> References: <1436300428-21163-1-git-send-email-yinghai@kernel.org> <1436300428-21163-2-git-send-email-yinghai@kernel.org> Date: Tue, 7 Jul 2015 13:57:56 -0700 X-Google-Sender-Auth: 8bAJCpmdTdKyCgT1DnnqxxZWvHU Message-ID: Subject: Re: [PATCH 01/42] x86, kasl: Remove not needed parameter for choose_kernel_location From: Kees Cook To: Yinghai Lu Cc: "H. Peter Anvin" , Baoquan He , LKML Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The subject has a typo "kasl" should be "kaslr". On Tue, Jul 7, 2015 at 1:19 PM, Yinghai Lu wrote: > real_mode is global variable, so we do not need to pass it around. > > Signed-off-by: Yinghai Lu Other than that, yeah, there's no good reason to pass that around. Acked-by: Kees Cook -Kees > --- > arch/x86/boot/compressed/aslr.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/aslr.c b/arch/x86/boot/compressed/aslr.c > index d7b1f65..71520c4 100644 > --- a/arch/x86/boot/compressed/aslr.c > +++ b/arch/x86/boot/compressed/aslr.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 a107b93..ebf72ce 100644 > --- a/arch/x86/boot/compressed/misc.c > +++ b/arch/x86/boot/compressed/misc.c > @@ -404,7 +404,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 805d25c..8c96cc5 100644 > --- a/arch/x86/boot/compressed/misc.h > +++ b/arch/x86/boot/compressed/misc.h > @@ -56,8 +56,7 @@ int cmdline_find_option_bool(const char *option); > > #if CONFIG_RANDOMIZE_BASE > /* aslr.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); > @@ -65,8 +64,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) > -- > 1.8.4.5 > -- Kees Cook Chrome OS Security