]> git.baikalelectronics.ru Git - kernel.git/commit
Revert "x86/mm/ASLR: Propagate base load address calculation"
authorBorislav Petkov <bp@suse.de>
Mon, 16 Mar 2015 10:06:28 +0000 (11:06 +0100)
committerIngo Molnar <mingo@kernel.org>
Mon, 16 Mar 2015 10:18:21 +0000 (11:18 +0100)
commit9a7f01fd514c1a2a9fe23e6d65e87af8cc62cbe0
treeacaef5a97a2632467fd4b492e6736af7420e52c0
parent21f5f42cf953c7685ad9819f3f46c0b628ace5a0
Revert "x86/mm/ASLR: Propagate base load address calculation"

This reverts commit:

  a75fdddb0914 ("x86/mm/ASLR: Propagate base load address calculation")

The main reason for the revert is that the new boot flag does not work
at all currently, and in order to make this work, we need non-trivial
changes to the x86 boot code which we didn't manage to get done in
time for merging.

And even if we did, they would've been too risky so instead of
rushing things and break booting 4.1 on boxes left and right, we
will be very strict and conservative and will take our time with
this to fix and test it properly.

Reported-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Baoquan He <bhe@redhat.com>
Cc: H. Peter Anvin <hpa@linux.intel.com
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Josh Triplett <josh@joshtriplett.org>
Cc: Junjie Mao <eternal.n08@gmail.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Matt Fleming <matt.fleming@intel.com>
Link: http://lkml.kernel.org/r/20150316100628.GD22995@pd.tnic
Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/boot/compressed/aslr.c
arch/x86/boot/compressed/misc.c
arch/x86/boot/compressed/misc.h
arch/x86/include/asm/page_types.h
arch/x86/include/uapi/asm/bootparam.h
arch/x86/kernel/module.c
arch/x86/kernel/setup.c