diff options
| author | Kirill A. Shutemov <kirill.shutemov@linux.intel.com> | 2019-08-26 16:26:01 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-09-10 10:35:26 +0100 |
| commit | 8d50b82ea79b57d53164d60d5bd6f44248b436f0 (patch) | |
| tree | 4fbe8d0d11504caf029cf169ea4dc97092878468 /arch | |
| parent | 852a051ef22bc8e6dd2d4bd5f3e90509c770beb6 (diff) | |
| download | linux-stable-8d50b82ea79b57d53164d60d5bd6f44248b436f0.tar.gz linux-stable-8d50b82ea79b57d53164d60d5bd6f44248b436f0.tar.bz2 linux-stable-8d50b82ea79b57d53164d60d5bd6f44248b436f0.zip | |
x86/boot/compressed/64: Fix missing initialization in find_trampoline_placement()
[ Upstream commit c96e8483cb2da6695c8b8d0896fe7ae272a07b54 ]
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
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/boot/compressed/pgtable_64.c | 2 |
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 f0537a1f7fc2..76e1edf5bf12 100644 --- a/arch/x86/boot/compressed/pgtable_64.c +++ b/arch/x86/boot/compressed/pgtable_64.c @@ -73,7 +73,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]; |