]> git.baikalelectronics.ru Git - kernel.git/commit
x86/boot/KASLR: Fix kexec crash due to 'virt_addr' calculation bug
authorBaoquan He <bhe@redhat.com>
Tue, 27 Jun 2017 12:39:06 +0000 (20:39 +0800)
committerIngo Molnar <mingo@kernel.org>
Fri, 30 Jun 2017 06:53:14 +0000 (08:53 +0200)
commit8eabf42ae5237e6b699aeac687b5b629e3537c8d
tree8c44cf4bae96bf80da05770b0212dff252c27e9e
parentb892cb873ced2af57dc5a018557d128c53ed6ae0
x86/boot/KASLR: Fix kexec crash due to 'virt_addr' calculation bug

Kernel text KASLR is separated into physical address and virtual
address randomization. And for virtual address randomization, we
only randomiza to get an offset between 16M and KERNEL_IMAGE_SIZE.
So the initial value of 'virt_addr' should be LOAD_PHYSICAL_ADDR,
but not the original kernel loading address 'output'.

The bug will cause kernel boot failure if kernel is loaded at a different
position than the address, 16M, which is decided at compiled time.
Kexec/kdump is such practical case.

To fix it, just assign LOAD_PHYSICAL_ADDR to virt_addr as initial
value.

Tested-by: Dave Young <dyoung@redhat.com>
Signed-off-by: Baoquan He <bhe@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Fixes: 8391c73 ("x86/KASLR: Randomize virtual address separately")
Link: http://lkml.kernel.org/r/1498567146-11990-3-git-send-email-bhe@redhat.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/boot/compressed/kaslr.c
arch/x86/boot/compressed/misc.c
arch/x86/boot/compressed/misc.h