From: Greg Kroah-Hartman Date: Mon, 26 Mar 2018 06:35:46 +0000 (+0200) Subject: 4.4-stable patches X-Git-Tag: v4.15.14~22 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4869acc845b9cdd199a8725d77bae3590f0660e6;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: x86-boot-64-verify-alignment-of-the-load-segment.patch x86-build-64-force-the-linker-to-use-2mb-page-size.patch --- diff --git a/queue-4.4/series b/queue-4.4/series index 5e57a5bbf5a..bad2dc9e162 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -33,3 +33,5 @@ can-cc770-fix-queue-stall-dropped-rtr-reply.patch can-cc770-fix-use-after-free-in-cc770_tx_interrupt.patch tty-vt-fix-up-tabstops-properly.patch kvm-x86-fix-icebp-instruction-handling.patch +x86-build-64-force-the-linker-to-use-2mb-page-size.patch +x86-boot-64-verify-alignment-of-the-load-segment.patch diff --git a/queue-4.4/x86-boot-64-verify-alignment-of-the-load-segment.patch b/queue-4.4/x86-boot-64-verify-alignment-of-the-load-segment.patch new file mode 100644 index 00000000000..20dc96b11fc --- /dev/null +++ b/queue-4.4/x86-boot-64-verify-alignment-of-the-load-segment.patch @@ -0,0 +1,43 @@ +From c55b8550fa57ba4f5e507be406ff9fc2845713e8 Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Mon, 19 Mar 2018 14:08:11 -0700 +Subject: x86/boot/64: Verify alignment of the LOAD segment + +From: H.J. Lu + +commit c55b8550fa57ba4f5e507be406ff9fc2845713e8 upstream. + +Since the x86-64 kernel must be aligned to 2MB, refuse to boot the +kernel if the alignment of the LOAD segment isn't a multiple of 2MB. + +Signed-off-by: H.J. Lu +Cc: Andy Shevchenko +Cc: Eric Biederman +Cc: H. Peter Anvin +Cc: Juergen Gross +Cc: Kees Cook +Cc: Kirill A. Shutemov +Cc: Linus Torvalds +Cc: Peter Zijlstra +Cc: Thomas Gleixner +Link: http://lkml.kernel.org/r/CAMe9rOrR7xSJgUfiCoZLuqWUwymRxXPoGBW38%2BpN%3D9g%2ByKNhZw@mail.gmail.com +Signed-off-by: Ingo Molnar +Signed-off-by: Greg Kroah-Hartman + +--- + arch/x86/boot/compressed/misc.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/arch/x86/boot/compressed/misc.c ++++ b/arch/x86/boot/compressed/misc.c +@@ -366,6 +366,10 @@ static void parse_elf(void *output) + + switch (phdr->p_type) { + case PT_LOAD: ++#ifdef CONFIG_X86_64 ++ if ((phdr->p_align % 0x200000) != 0) ++ error("Alignment of LOAD segment isn't multiple of 2MB"); ++#endif + #ifdef CONFIG_RELOCATABLE + dest = output; + dest += (phdr->p_paddr - LOAD_PHYSICAL_ADDR); diff --git a/queue-4.4/x86-build-64-force-the-linker-to-use-2mb-page-size.patch b/queue-4.4/x86-build-64-force-the-linker-to-use-2mb-page-size.patch new file mode 100644 index 00000000000..e368c3b6bc1 --- /dev/null +++ b/queue-4.4/x86-build-64-force-the-linker-to-use-2mb-page-size.patch @@ -0,0 +1,54 @@ +From e3d03598e8ae7d195af5d3d049596dec336f569f Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Mon, 19 Mar 2018 13:57:46 -0700 +Subject: x86/build/64: Force the linker to use 2MB page size + +From: H.J. Lu + +commit e3d03598e8ae7d195af5d3d049596dec336f569f upstream. + +Binutils 2.31 will enable -z separate-code by default for x86 to avoid +mixing code pages with data to improve cache performance as well as +security. To reduce x86-64 executable and shared object sizes, the +maximum page size is reduced from 2MB to 4KB. But x86-64 kernel must +be aligned to 2MB. Pass -z max-page-size=0x200000 to linker to force +2MB page size regardless of the default page size used by linker. + +Tested with Linux kernel 4.15.6 on x86-64. + +Signed-off-by: H.J. Lu +Cc: Andy Shevchenko +Cc: Eric Biederman +Cc: H. Peter Anvin +Cc: Juergen Gross +Cc: Kees Cook +Cc: Kirill A. Shutemov +Cc: Linus Torvalds +Cc: Peter Zijlstra +Cc: Thomas Gleixner +Link: http://lkml.kernel.org/r/CAMe9rOp4_%3D_8twdpTyAP2DhONOCeaTOsniJLoppzhoNptL8xzA@mail.gmail.com +Signed-off-by: Ingo Molnar +Signed-off-by: Greg Kroah-Hartman + +--- + arch/x86/Makefile | 9 +++++++++ + 1 file changed, 9 insertions(+) + +--- a/arch/x86/Makefile ++++ b/arch/x86/Makefile +@@ -179,6 +179,15 @@ KBUILD_CFLAGS += $(cfi) $(cfi-sigframe) + + LDFLAGS := -m elf_$(UTS_MACHINE) + ++# ++# The 64-bit kernel must be aligned to 2MB. Pass -z max-page-size=0x200000 to ++# the linker to force 2MB page size regardless of the default page size used ++# by the linker. ++# ++ifdef CONFIG_X86_64 ++LDFLAGS += $(call ld-option, -z max-page-size=0x200000) ++endif ++ + # Speed up the build + KBUILD_CFLAGS += -pipe + # Workaround for a gcc prelease that unfortunately was shipped in a suse release