From: "tip-bot for H.J. Lu" <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: jgross@suse.com, linux-kernel@vger.kernel.org,
kirill.shutemov@linux.intel.com, tglx@linutronix.de,
mingo@kernel.org, peterz@infradead.org, ebiederm@xmission.com,
torvalds@linux-foundation.org, andy.shevchenko@gmail.com,
hjl.tools@gmail.com, keescook@chromium.org, hpa@zytor.com
Subject: [tip:x86/pti] x86/boot/64: Verify alignment of the LOAD segment
Date: Tue, 20 Mar 2018 04:04:20 -0700 [thread overview]
Message-ID: <tip-c55b8550fa57ba4f5e507be406ff9fc2845713e8@git.kernel.org> (raw)
In-Reply-To: <CAMe9rOrR7xSJgUfiCoZLuqWUwymRxXPoGBW38+pN=9g+yKNhZw@mail.gmail.com>
Commit-ID: c55b8550fa57ba4f5e507be406ff9fc2845713e8
Gitweb: https://git.kernel.org/tip/c55b8550fa57ba4f5e507be406ff9fc2845713e8
Author: H.J. Lu <hjl.tools@gmail.com>
AuthorDate: Mon, 19 Mar 2018 14:08:11 -0700
Committer: Ingo Molnar <mingo@kernel.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@gmail.com>
Cc: Andy Shevchenko <andy.shevchenko@gmail.com>
Cc: Eric Biederman <ebiederm@xmission.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/CAMe9rOrR7xSJgUfiCoZLuqWUwymRxXPoGBW38%2BpN%3D9g%2ByKNhZw@mail.gmail.com
Signed-off-by: Ingo Molnar <mingo@kernel.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);
prev parent reply other threads:[~2018-03-20 11:05 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-19 21:08 [PATCH] x86-64: Verify alignment of " H.J. Lu
2018-03-20 11:04 ` tip-bot for H.J. Lu [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-c55b8550fa57ba4f5e507be406ff9fc2845713e8@git.kernel.org \
--to=tipbot@zytor.com \
--cc=andy.shevchenko@gmail.com \
--cc=ebiederm@xmission.com \
--cc=hjl.tools@gmail.com \
--cc=hpa@zytor.com \
--cc=jgross@suse.com \
--cc=keescook@chromium.org \
--cc=kirill.shutemov@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome