[PATCH v2 04/14] arm64: efi: clean up Image header after PE header has been split off

All of lore.kernel.org
 help / color / mirror / Atom feed

From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
To: linux-efi@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	mark.rutland@arm.com, leif.lindholm@linaro.org
Cc: catalin.marinas@arm.com, linux@armlinux.org.uk,
	kernel-hardening@lists.openwall.com, labbott@fedoraproject.org,
	Ard Biesheuvel <ard.biesheuvel@linaro.org>
Subject: [PATCH v2 04/14] arm64: efi: clean up Image header after PE header has been split off
Date: Wed,  8 Feb 2017 11:55:37 +0000	[thread overview]
Message-ID: <1486554947-3964-5-git-send-email-ard.biesheuvel@linaro.org> (raw)
In-Reply-To: <1486554947-3964-1-git-send-email-ard.biesheuvel@linaro.org>

After having split off the PE header, clean up the bits that remain:
use .long consistently, merge two adjacent #ifdef CONFIG_EFI blocks,
fix the offset of the PE header pointer and remove the redundant .align
that follows it.

Also, since we will be eliminating all open coded constants from the
EFI header in subsequent patches, let's replace the open coded "ARM\x64"
magic number with its .ascii equivalent.

No changes to the resulting binary image are intended.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 arch/arm64/kernel/head.S | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S
index f779a7483736..aa8f6cd8c33f 100644
--- a/arch/arm64/kernel/head.S
+++ b/arch/arm64/kernel/head.S
@@ -91,20 +91,19 @@ _head:
 	.quad	0				// reserved
 	.quad	0				// reserved
 	.quad	0				// reserved
-	.byte	0x41				// Magic number, "ARM\x64"
-	.byte	0x52
-	.byte	0x4d
-	.byte	0x64
+	.ascii	"ARM\x64"			// Magic number
 #ifdef CONFIG_EFI
+	/*
+	 * PE/COFF requires the offset to the PE header
+	 * to be stored at offset 0x3c into the file.
+	 */
+	.org	_head + 0x3c
 	.long	pe_header - _head		// Offset to the PE header.
-#else
-	.word	0				// reserved
-#endif
 
-#ifdef CONFIG_EFI
-	.align 3
 pe_header:
 	__EFI_PE_HEADER
+#else
+	.long	0				// reserved
 #endif
 
 	__INIT
-- 
2.7.4

WARNING: multiple messages have this Message-ID (diff)

From: ard.biesheuvel@linaro.org (Ard Biesheuvel)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 04/14] arm64: efi: clean up Image header after PE header has been split off
Date: Wed,  8 Feb 2017 11:55:37 +0000	[thread overview]
Message-ID: <1486554947-3964-5-git-send-email-ard.biesheuvel@linaro.org> (raw)
In-Reply-To: <1486554947-3964-1-git-send-email-ard.biesheuvel@linaro.org>

After having split off the PE header, clean up the bits that remain:
use .long consistently, merge two adjacent #ifdef CONFIG_EFI blocks,
fix the offset of the PE header pointer and remove the redundant .align
that follows it.

Also, since we will be eliminating all open coded constants from the
EFI header in subsequent patches, let's replace the open coded "ARM\x64"
magic number with its .ascii equivalent.

No changes to the resulting binary image are intended.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 arch/arm64/kernel/head.S | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S
index f779a7483736..aa8f6cd8c33f 100644
--- a/arch/arm64/kernel/head.S
+++ b/arch/arm64/kernel/head.S
@@ -91,20 +91,19 @@ _head:
 	.quad	0				// reserved
 	.quad	0				// reserved
 	.quad	0				// reserved
-	.byte	0x41				// Magic number, "ARM\x64"
-	.byte	0x52
-	.byte	0x4d
-	.byte	0x64
+	.ascii	"ARM\x64"			// Magic number
 #ifdef CONFIG_EFI
+	/*
+	 * PE/COFF requires the offset to the PE header
+	 * to be stored at offset 0x3c into the file.
+	 */
+	.org	_head + 0x3c
 	.long	pe_header - _head		// Offset to the PE header.
-#else
-	.word	0				// reserved
-#endif
 
-#ifdef CONFIG_EFI
-	.align 3
 pe_header:
 	__EFI_PE_HEADER
+#else
+	.long	0				// reserved
 #endif
 
 	__INIT
-- 
2.7.4

WARNING: multiple messages have this Message-ID (diff)

From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
To: linux-efi@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	mark.rutland@arm.com, leif.lindholm@linaro.org
Cc: catalin.marinas@arm.com, linux@armlinux.org.uk,
	kernel-hardening@lists.openwall.com, labbott@fedoraproject.org,
	Ard Biesheuvel <ard.biesheuvel@linaro.org>
Subject: [kernel-hardening] [PATCH v2 04/14] arm64: efi: clean up Image header after PE header has been split off
Date: Wed,  8 Feb 2017 11:55:37 +0000	[thread overview]
Message-ID: <1486554947-3964-5-git-send-email-ard.biesheuvel@linaro.org> (raw)
In-Reply-To: <1486554947-3964-1-git-send-email-ard.biesheuvel@linaro.org>

After having split off the PE header, clean up the bits that remain:
use .long consistently, merge two adjacent #ifdef CONFIG_EFI blocks,
fix the offset of the PE header pointer and remove the redundant .align
that follows it.

Also, since we will be eliminating all open coded constants from the
EFI header in subsequent patches, let's replace the open coded "ARM\x64"
magic number with its .ascii equivalent.

No changes to the resulting binary image are intended.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 arch/arm64/kernel/head.S | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S
index f779a7483736..aa8f6cd8c33f 100644
--- a/arch/arm64/kernel/head.S
+++ b/arch/arm64/kernel/head.S
@@ -91,20 +91,19 @@ _head:
 	.quad	0				// reserved
 	.quad	0				// reserved
 	.quad	0				// reserved
-	.byte	0x41				// Magic number, "ARM\x64"
-	.byte	0x52
-	.byte	0x4d
-	.byte	0x64
+	.ascii	"ARM\x64"			// Magic number
 #ifdef CONFIG_EFI
+	/*
+	 * PE/COFF requires the offset to the PE header
+	 * to be stored at offset 0x3c into the file.
+	 */
+	.org	_head + 0x3c
 	.long	pe_header - _head		// Offset to the PE header.
-#else
-	.word	0				// reserved
-#endif
 
-#ifdef CONFIG_EFI
-	.align 3
 pe_header:
 	__EFI_PE_HEADER
+#else
+	.long	0				// reserved
 #endif
 
 	__INIT
-- 
2.7.4

next prev parent reply	other threads:[~2017-02-08 11:55 UTC|newest]

Thread overview: 69+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-08 11:55 [PATCH v2 00/14] arm64+ARM: efi: PE/COFF cleanup/hardening Ard Biesheuvel
2017-02-08 11:55 ` [kernel-hardening] " Ard Biesheuvel
2017-02-08 11:55 ` Ard Biesheuvel
2017-02-08 11:55 ` [PATCH v2 01/14] include: pe.h: allow for use in assembly Ard Biesheuvel
2017-02-08 11:55   ` [kernel-hardening] " Ard Biesheuvel
2017-02-08 11:55   ` Ard Biesheuvel
2017-02-08 11:55 ` [PATCH v2 02/14] include: pe.h: add some missing definitions Ard Biesheuvel
2017-02-08 11:55   ` [kernel-hardening] " Ard Biesheuvel
2017-02-08 11:55   ` Ard Biesheuvel
2017-02-08 11:55 ` [PATCH v2 03/14] arm64: efi: move EFI header and related data to a separate .S file Ard Biesheuvel
2017-02-08 11:55   ` [kernel-hardening] " Ard Biesheuvel
2017-02-08 11:55   ` Ard Biesheuvel
2017-02-10 10:10   ` Mark Rutland
2017-02-10 10:10     ` [kernel-hardening] " Mark Rutland
2017-02-10 10:10     ` Mark Rutland
2017-02-08 11:55 ` Ard Biesheuvel [this message]
2017-02-08 11:55   ` [kernel-hardening] [PATCH v2 04/14] arm64: efi: clean up Image header after PE header has been split off Ard Biesheuvel
2017-02-08 11:55   ` Ard Biesheuvel
2017-02-10 10:11   ` Mark Rutland
2017-02-10 10:11     ` [kernel-hardening] " Mark Rutland
2017-02-10 10:11     ` Mark Rutland
2017-02-10 14:30     ` Ard Biesheuvel
2017-02-10 14:30       ` [kernel-hardening] " Ard Biesheuvel
2017-02-10 14:30       ` Ard Biesheuvel
2017-02-08 11:55 ` [PATCH v2 05/14] arm64: efi: remove forbidden values from the PE/COFF header Ard Biesheuvel
2017-02-08 11:55   ` [kernel-hardening] " Ard Biesheuvel
2017-02-08 11:55   ` Ard Biesheuvel
2017-02-10 10:13   ` Mark Rutland
2017-02-10 10:13     ` [kernel-hardening] " Mark Rutland
2017-02-10 10:13     ` Mark Rutland
2017-02-10 14:31     ` Ard Biesheuvel
2017-02-10 14:31       ` [kernel-hardening] " Ard Biesheuvel
2017-02-10 14:31       ` Ard Biesheuvel
2017-02-08 11:55 ` [PATCH v2 06/14] arm64: efi: remove pointless dummy .reloc section Ard Biesheuvel
2017-02-08 11:55   ` [kernel-hardening] " Ard Biesheuvel
2017-02-08 11:55   ` Ard Biesheuvel
2017-02-08 11:55 ` [PATCH v2 07/14] arm64: efi: replace open coded constants with symbolic ones Ard Biesheuvel
2017-02-08 11:55   ` [kernel-hardening] " Ard Biesheuvel
2017-02-08 11:55   ` Ard Biesheuvel
2017-02-10 10:19   ` Mark Rutland
2017-02-10 10:19     ` [kernel-hardening] " Mark Rutland
2017-02-10 10:19     ` Mark Rutland
2017-02-08 11:55 ` [PATCH v2 08/14] arm64: efi: split Image code and data into separate PE/COFF sections Ard Biesheuvel
2017-02-08 11:55   ` [kernel-hardening] " Ard Biesheuvel
2017-02-08 11:55   ` Ard Biesheuvel
     [not found]   ` <1486554947-3964-9-git-send-email-ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2017-02-10 10:49     ` Mark Rutland
2017-02-10 10:49       ` [kernel-hardening] " Mark Rutland
2017-02-10 10:49       ` Mark Rutland
2017-02-10 14:28       ` Ard Biesheuvel
2017-02-10 14:28         ` [kernel-hardening] " Ard Biesheuvel
2017-02-10 14:28         ` Ard Biesheuvel
2017-02-08 11:55 ` [PATCH v2 09/14] arm: compressed: put zImage header and EFI header in dedicated section Ard Biesheuvel
2017-02-08 11:55   ` [kernel-hardening] " Ard Biesheuvel
2017-02-08 11:55   ` Ard Biesheuvel
2017-02-08 11:55 ` [PATCH v2 10/14] arm: efi: remove forbidden values from the PE/COFF header Ard Biesheuvel
2017-02-08 11:55   ` [kernel-hardening] " Ard Biesheuvel
2017-02-08 11:55   ` Ard Biesheuvel
2017-02-08 11:55 ` [PATCH v2 11/14] arm: efi: remove pointless dummy .reloc section Ard Biesheuvel
2017-02-08 11:55   ` [kernel-hardening] " Ard Biesheuvel
2017-02-08 11:55   ` Ard Biesheuvel
2017-02-08 11:55 ` [PATCH v2 12/14] arm: efi: replace open coded constants with symbolic ones Ard Biesheuvel
2017-02-08 11:55   ` [kernel-hardening] " Ard Biesheuvel
2017-02-08 11:55   ` Ard Biesheuvel
2017-02-08 11:55 ` [PATCH v2 13/14] arm: efi: split zImage code and data into separate PE/COFF sections Ard Biesheuvel
2017-02-08 11:55   ` [kernel-hardening] " Ard Biesheuvel
2017-02-08 11:55   ` Ard Biesheuvel
2017-02-08 11:55 ` [PATCH v2 14/14] arm: efi: add PE/COFF debug table to EFI header Ard Biesheuvel
2017-02-08 11:55   ` [kernel-hardening] " Ard Biesheuvel
2017-02-08 11:55   ` Ard Biesheuvel

find likely ancestor, descendant, or conflicting patches for this message:
dfblob:f779a748373 dfblob:f779a748373 dfblob:f779a748373
dfblob:aa8f6cd8c33 dfblob:aa8f6cd8c33 dfblob:aa8f6cd8c33
	(help)

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=1486554947-3964-5-git-send-email-ard.biesheuvel@linaro.org \
    --to=ard.biesheuvel@linaro.org \
    --cc=catalin.marinas@arm.com \
    --cc=kernel-hardening@lists.openwall.com \
    --cc=labbott@fedoraproject.org \
    --cc=leif.lindholm@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-efi@vger.kernel.org \
    --cc=linux@armlinux.org.uk \
    --cc=mark.rutland@arm.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.