[tip:x86/urgent] x86/boot: Double BOOT_HEAP_SIZE to 64KB
From: tip-bot for H.J. Lu <hidden>
Date: 2016-01-11 11:43:45
Subsystem:
the rest, x86 architecture (32-bit and 64-bit) · Maintainers:
Linus Torvalds, Thomas Gleixner, Ingo Molnar, Borislav Petkov, Dave Hansen
Commit-ID: 8c31902cffc4d716450be549c66a67a8a3dd479c Gitweb: http://git.kernel.org/tip/8c31902cffc4d716450be549c66a67a8a3dd479c Author: H.J. Lu [off-list ref] AuthorDate: Mon, 4 Jan 2016 10:17:09 -0800 Committer: Ingo Molnar [off-list ref] CommitDate: Mon, 11 Jan 2016 12:30:50 +0100 x86/boot: Double BOOT_HEAP_SIZE to 64KB When decompressing kernel image during x86 bootup, malloc memory for ELF program headers may run out of heap space, which leads to system halt. This patch doubles BOOT_HEAP_SIZE to 64KB. Tested with 32-bit kernel which failed to boot without this patch. Signed-off-by: H.J. Lu <redacted> Acked-by: H. Peter Anvin <hpa@zytor.com> Cc: Andy Lutomirski <luto@amacapital.net> Cc: Borislav Petkov <bp@alien8.de> Cc: Brian Gerst <redacted> Cc: Denys Vlasenko <redacted> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <redacted> Cc: linux-kernel@vger.kernel.org Cc: <redacted> Signed-off-by: Ingo Molnar <mingo@kernel.org> --- arch/x86/include/asm/boot.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h
index 4fa687a..6b8d6e8 100644
--- a/arch/x86/include/asm/boot.h
+++ b/arch/x86/include/asm/boot.h@@ -27,7 +27,7 @@ #define BOOT_HEAP_SIZE 0x400000 #else /* !CONFIG_KERNEL_BZIP2 */ -#define BOOT_HEAP_SIZE 0x8000 +#define BOOT_HEAP_SIZE 0x10000 #endif /* !CONFIG_KERNEL_BZIP2 */