Skip to contentSkip to conversation

Patch "x86/boot: Double BOOT_HEAP_SIZE to 64KB" has been added to the 3.13.y-ckt tree

3.13.y-ckt stable Kamal Mostafa 1 participant 1 message Feb 2, 2016 x86

lore
Share & tools
lore
#0 lore raw

This is a note to let you know that I have just added a patch titled

x86/boot: Double BOOT_HEAP_SIZE to 64KB

to the linux-3.13.y-queue branch of the 3.13.y-ckt extended stable tree which can be found at:

    http://kernel.ubuntu.com/git/ubuntu/linux.git/log/?h=linux-3.13.y-queue

This patch is scheduled to be released in version 3.13.11-ckt34.

If you, or anyone else, feels it should not be added to this tree, please reply to this email.

For more information about the 3.13.y-ckt tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Kamal

---8<------------------------------------------------------------

Quoted 1 line

From 90d47697d391943fa9f51880d888c27b2fe2f9c6 Mon Sep 17 00:00:00 2001

From: "H.J. Lu" <[email protected]>
Date: Mon, 4 Jan 2016 10:17:09 -0800
Subject: x86/boot: Double BOOT_HEAP_SIZE to 64KB

commit 8c31902cffc4d716450be549c66a67a8a3dd479c upstream.

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.

Cc Andy Lutomirski <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc Brian Gerst <[email protected]>
Cc Denys Vlasenko <[email protected]>
Cc Linus Torvalds <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Thomas Gleixner <[email protected]>
---
 arch/x86/include/asm/boot.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/include/asm/boot.h +1 -1
index 4fa687a..6b8d6e8 100644
@@ -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 */
 

--
1.9.1