linux-kernel - [tip:x86/pti] x86/boot/64: Verify alignment of the LOAD segment

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <tip-c55b8550fa57ba4f5e507be406ff9fc2845713e8@git.kernel.org>
Date:   Tue, 20 Mar 2018 04:04:20 -0700
From:   "tip-bot for H.J. Lu" <tipbot@...or.com>
To:     linux-tip-commits@...r.kernel.org
Cc:     jgross@...e.com, linux-kernel@...r.kernel.org,
        kirill.shutemov@...ux.intel.com, tglx@...utronix.de,
        mingo@...nel.org, peterz@...radead.org, ebiederm@...ssion.com,
        torvalds@...ux-foundation.org, andy.shevchenko@...il.com,
        hjl.tools@...il.com, keescook@...omium.org, hpa@...or.com
Subject: [tip:x86/pti] x86/boot/64: Verify alignment of the LOAD segment

Commit-ID:  c55b8550fa57ba4f5e507be406ff9fc2845713e8
Gitweb:     https://git.kernel.org/tip/c55b8550fa57ba4f5e507be406ff9fc2845713e8
Author:     H.J. Lu <hjl.tools@...il.com>
AuthorDate: Mon, 19 Mar 2018 14:08:11 -0700
Committer:  Ingo Molnar <mingo@...nel.org>
CommitDate: Tue, 20 Mar 2018 08:03:03 +0100

x86/boot/64: Verify alignment of the LOAD segment

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 <hjl.tools@...il.com>
Cc: Andy Shevchenko <andy.shevchenko@...il.com>
Cc: Eric Biederman <ebiederm@...ssion.com>
Cc: H. Peter Anvin <hpa@...or.com>
Cc: Juergen Gross <jgross@...e.com>
Cc: Kees Cook <keescook@...omium.org>
Cc: Kirill A. Shutemov <kirill.shutemov@...ux.intel.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Thomas Gleixner <tglx@...utronix.de>
Link: http://lkml.kernel.org/r/CAMe9rOrR7xSJgUfiCoZLuqWUwymRxXPoGBW38%2BpN%3D9g%2ByKNhZw@mail.gmail.com
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
 arch/x86/boot/compressed/misc.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
index 98761a1576ce..252fee320816 100644
--- a/arch/x86/boot/compressed/misc.c
+++ b/arch/x86/boot/compressed/misc.c
@@ -309,6 +309,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);