grub-devel.gnu.org archive mirror
 help / color / mirror / Atom feed
From: Josh Triplett <josh@joshtriplett.org>
To: grub-devel@gnu.org
Subject: [PATCH 4/4] efi: On x86-64, align the stack to a 16-byte boundary as required by ABI
Date: Tue, 12 Nov 2013 18:27:03 -0800	[thread overview]
Message-ID: <c4661d21b73f1b40a0da056b87ca867833c087a4.1384309081.git.josh@joshtriplett.org> (raw)
In-Reply-To: <cover.1384309081.git.josh@joshtriplett.org>

The x86-64 ABI specification requires a 16-byte-aligned stack.  In some
cases, GCC emits code that assumes this alignment, which crashes if not
aligned.  The EFI firmware is also entitled to assume that stack
alignment without checking, and some firmware does make that assumption.
---

ChangeLog entry:

2013-11-13  Josh Triplett  <josh@joshtriplett.org>

	* grub-core/kern/x86_64/efi/startup.S (_start): Align the stack to a
	  16-byte boundary, as required by the x86-64 ABI, before calling
	  grub_main.  In some cases, GCC emits code that assumes this
	  alignment, which crashes if not aligned.  The EFI firmware is also
	  entitled to assume that stack alignment without checking.

 grub-core/kern/x86_64/efi/startup.S | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/grub-core/kern/x86_64/efi/startup.S b/grub-core/kern/x86_64/efi/startup.S
index f86f019..94bd6ae 100644
--- a/grub-core/kern/x86_64/efi/startup.S
+++ b/grub-core/kern/x86_64/efi/startup.S
@@ -29,7 +29,11 @@ start:
 _start:
 	movq	%rcx, EXT_C(grub_efi_image_handle)(%rip)
 	movq	%rdx, EXT_C(grub_efi_system_table)(%rip)
-
+	mov	%rsp, %rax
+	subq	$8, %rsp
+	and	$~0xf, %rsp
+	mov	%rax, (%rsp)
 	call	EXT_C(grub_main)
+	mov	(%rsp), %rsp
 	ret
 
-- 
1.8.4.3



  parent reply	other threads:[~2013-11-13  2:27 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-13  2:25 [PATCH 0/4] i386-efi and x86_64-efi fixes Josh Triplett
2013-11-13  2:26 ` [PATCH 1/4] efi: Fix firmware memory allocation to round to 4k pages, not 1k Josh Triplett
2013-11-18 17:01   ` Vladimir 'φ-coder/phcoder' Serbinenko
2013-11-13  2:26 ` [PATCH 2/4] efi: Fix requests to allocate GRUB_MEMORY_AVAILABLE Josh Triplett
2013-11-18 16:58   ` Vladimir 'φ-coder/phcoder' Serbinenko
2013-11-13  2:26 ` [PATCH 3/4] efi: Support GRUB_MMAP_MALLOC_LOW in the EFI firmware allocator Josh Triplett
2013-11-13  3:59   ` Andrey Borzenkov
2013-11-14  8:08     ` Vladimir 'φ-coder/phcoder' Serbinenko
2013-11-14  8:05   ` Vladimir 'φ-coder/phcoder' Serbinenko
2013-11-13  2:27 ` Josh Triplett [this message]
2013-11-14  8:01   ` [PATCH 4/4] efi: On x86-64, align the stack to a 16-byte boundary as required by ABI Vladimir 'φ-coder/phcoder' Serbinenko
2013-11-15  7:15   ` Jordan Justen
2013-11-15 11:01     ` Vladimir 'φ-coder/phcoder' Serbinenko
2013-11-19 13:32   ` Vladimir 'φ-coder/phcoder' Serbinenko

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=c4661d21b73f1b40a0da056b87ca867833c087a4.1384309081.git.josh@joshtriplett.org \
    --to=josh@joshtriplett.org \
    --cc=grub-devel@gnu.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;
as well as URLs for NNTP newsgroup(s).