[<prev] [next>] [day] [month] [year] [list]
Message-ID: <tip-e47bb0bda46bf50f81671db502d0c903e0a32604@git.kernel.org>
Date: Mon, 26 Mar 2012 15:21:17 -0700
From: tip-bot for Matt Fleming <matt.fleming@...el.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...nel.org,
jordan.l.justen@...el.com, tglx@...utronix.de, hpa@...ux.intel.com,
matt.fleming@...el.com
Subject: [tip:x86/efi] x86, efi:
Fix NumberOfRvaAndSizes field in PE32 header for EFI_STUB
Commit-ID: e47bb0bda46bf50f81671db502d0c903e0a32604
Gitweb: http://git.kernel.org/tip/e47bb0bda46bf50f81671db502d0c903e0a32604
Author: Matt Fleming <matt.fleming@...el.com>
AuthorDate: Fri, 23 Mar 2012 09:35:06 -0700
Committer: H. Peter Anvin <hpa@...ux.intel.com>
CommitDate: Mon, 26 Mar 2012 13:10:02 -0700
x86, efi: Fix NumberOfRvaAndSizes field in PE32 header for EFI_STUB
We've actually got six data directories in the header, not one. Even
though the firmware loader doesn't seem to mind, when we come to sign
the kernel image the signing tool thinks that there is no Certificate
Table data directory, even though we've allocated space for one.
Signed-off-by: Matt Fleming <matt.fleming@...el.com>
Link: http://lkml.kernel.org/r/1332520506-6472-4-git-send-email-jordan.l.justen@intel.com
Reviewed-by: Jordan Justen <jordan.l.justen@...el.com>
Signed-off-by: H. Peter Anvin <hpa@...ux.intel.com>
---
arch/x86/boot/header.S | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
index 4ceb56e..8bbea6a 100644
--- a/arch/x86/boot/header.S
+++ b/arch/x86/boot/header.S
@@ -189,7 +189,7 @@ extra_header_fields:
.quad 0 # SizeOfHeapCommit
#endif
.long 0 # LoaderFlags
- .long 0x1 # NumberOfRvaAndSizes
+ .long 0x6 # NumberOfRvaAndSizes
.quad 0 # ExportTable
.quad 0 # ImportTable
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists