summaryrefslogtreecommitdiffstats
path: root/arch/x86/boot
diff options
context:
space:
mode:
authorKirill A. Shutemov <kirill.shutemov@linux.intel.com>2019-08-26 15:26:01 +0200
committerThomas Gleixner <tglx@linutronix.de>2019-08-27 10:46:27 +0200
commitc96e8483cb2da6695c8b8d0896fe7ae272a07b54 (patch)
tree7feceda783817fa7bc49bc7972c1f9789ad6ae1f /arch/x86/boot
parentx86/apic: Include the LDR when clearing out APIC registers (diff)
downloadlinux-c96e8483cb2da6695c8b8d0896fe7ae272a07b54.tar.xz
linux-c96e8483cb2da6695c8b8d0896fe7ae272a07b54.zip
x86/boot/compressed/64: Fix missing initialization in find_trampoline_placement()
Gustavo noticed that 'new' can be left uninitialized if 'bios_start' happens to be less or equal to 'entry->addr + entry->size'. Initialize the variable at the begin of the iteration to the current value of 'bios_start'. Fixes: 0a46fff2f910 ("x86/boot/compressed/64: Fix boot on machines with broken E820 table") Reported-by: "Gustavo A. R. Silva" <gustavo@embeddedor.com> Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Link: https://lkml.kernel.org/r/20190826133326.7cxb4vbmiawffv2r@box
Diffstat (limited to 'arch/x86/boot')
-rw-r--r--arch/x86/boot/compressed/pgtable_64.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/boot/compressed/pgtable_64.c b/arch/x86/boot/compressed/pgtable_64.c
index 2faddeb0398a..c8862696a47b 100644
--- a/arch/x86/boot/compressed/pgtable_64.c
+++ b/arch/x86/boot/compressed/pgtable_64.c
@@ -72,7 +72,7 @@ static unsigned long find_trampoline_placement(void)
/* Find the first usable memory region under bios_start. */
for (i = boot_params->e820_entries - 1; i >= 0; i--) {
- unsigned long new;
+ unsigned long new = bios_start;
entry = &boot_params->e820_table[i];