The subject has a typo "kasl" should be "kaslr". On Tue, Jul 7, 2015 at 1:19 PM, Yinghai Lu <ying...@kernel.org> wrote: > real_mode is global variable, so we do not need to pass it around. > > Signed-off-by: Yinghai Lu <ying...@kernel.org>
Other than that, yeah, there's no good reason to pass that around. Acked-by: Kees Cook <keesc...@chromium.org> -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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
