Skip to contentSkip to conversation

Patch "x86/boot: Double BOOT_HEAP_SIZE to 64KB" has been added to the 3.14-stable tree

PATCH [email protected] 1 participant 1 message Jan 24, 2016

Subsystems (2)
Stable branch x86
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

x86/boot: Double BOOT_HEAP_SIZE to 64KB

to the 3.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:

     x86-boot-double-boot_heap_size-to-64kb.patch

and it can be found in the queue-3.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 8c31902cffc4d716450be549c66a67a8a3dd479c 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

From: "H.J. Lu" <[email protected]>

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.

Signed-off-by H.J. Lu <[email protected]>
Acked-by H. Peter Anvin <[email protected]>
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]>
Cc [email protected]
Signed-off-by Ingo Molnar <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 arch/x86/include/asm/boot.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/include/asm/boot.h +1 -1
@@ -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 */

Patches currently in stable-queue which might be from [email protected] are

queue-3.14/x86-boot-double-boot_heap_size-to-64kb.patch