From: "Marvin Häuser" <mhaeuser@posteo.de>
To: Ard Biesheuvel <ardb@kernel.org>
Cc: edk2-devel-groups-io <devel@edk2.groups.io>,
Michael Kinney <michael.d.kinney@intel.com>,
Liming Gao <gaoliming@byosoft.com.cn>,
Jiewen Yao <jiewen.yao@intel.com>,
Michael Kubacki <michael.kubacki@microsoft.com>,
Sean Brogan <sean.brogan@microsoft.com>,
Rebecca Cran <quic_rcran@quicinc.com>,
Leif Lindholm <quic_llindhol@quicinc.com>,
Sami Mujawar <sami.mujawar@arm.com>,
Taylor Beebe <t@taylorbeebe.com>, Bob Feng <bob.c.feng@intel.com>
Subject: Re: [PATCH v2 14/17] BaseTools/GenFw: Add DllCharacteristicsEx field to debug data
Date: Mon, 27 Mar 2023 15:46:01 +0000 [thread overview]
Message-ID: <49927D70-11BA-4B5D-93B5-764A853F2ED0@posteo.de> (raw)
In-Reply-To: <20230327110112.262503-15-ardb@kernel.org>
[-- Attachment #1: Type: text/plain, Size: 6273 bytes --]
Hi Ard,
> On 27. Mar 2023, at 13:01, Ard Biesheuvel <ardb@kernel.org> wrote:
>
> The PE/COFF spec describes an additional DllCharacteristics field
> implemented as a debug directory entry, which carries flags related to
> which control flow integrity (CFI) features are supported by the binary.
Out of mere personal interest, is there any reference for this yet? The "PE format" page [1] doesn't seem to have this yet.
[1] https://learn.microsoft.com/en-us/windows/win32/debug/pe-format#the-debug-section
>
> So let's add this entry when doing ELF to PE/COFF conversion - we will
> add support for setting the flags in a subsequent patch.
>
> Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
> ---
> BaseTools/Source/C/GenFw/Elf64Convert.c | 54 +++++++++++++++-----
> BaseTools/Source/C/GenFw/GenFw.c | 3 +-
> BaseTools/Source/C/Include/IndustryStandard/PeImage.h | 13 ++++-
> 3 files changed, 55 insertions(+), 15 deletions(-)
>
> diff --git a/BaseTools/Source/C/GenFw/Elf64Convert.c b/BaseTools/Source/C/GenFw/Elf64Convert.c
> index 2a810e835d4a4a66..9c17c90b16602421 100644
> --- a/BaseTools/Source/C/GenFw/Elf64Convert.c
> +++ b/BaseTools/Source/C/GenFw/Elf64Convert.c
> @@ -992,6 +992,16 @@ ScanSections64 (
> sizeof(EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY) +
> strlen(mInImageName) + 1;
>
> + //
> + // Add more space in the .debug data region for the DllCharacteristicsEx
> + // field.
> + //
> + if (mDllCharacteristicsEx != 0) {
> + mCoffOffset = DebugRvaAlign(mCoffOffset) +
> + sizeof (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY) +
> + sizeof (EFI_IMAGE_DEBUG_EX_DLLCHARACTERISTICS_ENTRY);
> + }
> +
> mCoffOffset = CoffAlign(mCoffOffset);
> if (SectionCount == 0) {
> mDataOffset = mCoffOffset;
> @@ -2244,29 +2254,47 @@ WriteDebug64 (
> VOID
> )
> {
> - UINT32 Len;
> - EFI_IMAGE_OPTIONAL_HEADER_UNION *NtHdr;
> - EFI_IMAGE_DATA_DIRECTORY *DataDir;
> - EFI_IMAGE_DEBUG_DIRECTORY_ENTRY *Dir;
> - EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY *Nb10;
> + UINT32 Len;
> + EFI_IMAGE_OPTIONAL_HEADER_UNION *NtHdr;
> + EFI_IMAGE_DATA_DIRECTORY *DataDir;
> + EFI_IMAGE_DEBUG_DIRECTORY_ENTRY *Dir;
> + EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY *Nb10;
> + EFI_IMAGE_DEBUG_EX_DLLCHARACTERISTICS_ENTRY *DllEntry;
>
> Len = strlen(mInImageName) + 1;
>
> + NtHdr = (EFI_IMAGE_OPTIONAL_HEADER_UNION *)(mCoffFile + mNtHdrOffset);
> + DataDir = &NtHdr->Pe32Plus.OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_DEBUG];
> + DataDir->VirtualAddress = mDebugOffset;
> + DataDir->Size = sizeof (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY);
> +
> Dir = (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY*)(mCoffFile + mDebugOffset);
> +
> + if (mDllCharacteristicsEx != 0) {
> + DataDir->Size += sizeof (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY);
> +
> + Dir->Type = EFI_IMAGE_DEBUG_TYPE_EX_DLLCHARACTERISTICS;
> + Dir->SizeOfData = sizeof (EFI_IMAGE_DEBUG_EX_DLLCHARACTERISTICS_ENTRY);
> + Dir->FileOffset = mDebugOffset + DataDir->Size +
> + sizeof (EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY) +
> + DebugRvaAlign(Len);
> + Dir->RVA = Dir->FileOffset;
> +
> + DllEntry = (VOID *)(mCoffFile + Dir->FileOffset);
> +
> + DllEntry->DllCharacteristicsEx = mDllCharacteristicsEx;
> +
> + Dir++;
> + }
> +
> Dir->Type = EFI_IMAGE_DEBUG_TYPE_CODEVIEW;
> Dir->SizeOfData = sizeof(EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY) + Len;
> - Dir->RVA = mDebugOffset + sizeof(EFI_IMAGE_DEBUG_DIRECTORY_ENTRY);
> - Dir->FileOffset = mDebugOffset + sizeof(EFI_IMAGE_DEBUG_DIRECTORY_ENTRY);
> + Dir->RVA = mDebugOffset + DataDir->Size;
> + Dir->FileOffset = mDebugOffset + DataDir->Size;
>
> Nb10 = (EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY*)(Dir + 1);
> Nb10->Signature = CODEVIEW_SIGNATURE_NB10;
> strcpy ((char *)(Nb10 + 1), mInImageName);
> -
> -
> - NtHdr = (EFI_IMAGE_OPTIONAL_HEADER_UNION *)(mCoffFile + mNtHdrOffset);
> - DataDir = &NtHdr->Pe32Plus.OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_DEBUG];
> - DataDir->VirtualAddress = mDebugOffset;
> - DataDir->Size = sizeof(EFI_IMAGE_DEBUG_DIRECTORY_ENTRY);
> }
>
> STATIC
> diff --git a/BaseTools/Source/C/GenFw/GenFw.c b/BaseTools/Source/C/GenFw/GenFw.c
> index 6f61f16788cd2a0a..d0e52ccc26431380 100644
> --- a/BaseTools/Source/C/GenFw/GenFw.c
> +++ b/BaseTools/Source/C/GenFw/GenFw.c
> @@ -2932,7 +2932,8 @@ Routine Description:
> if (mIsConvertXip) {
> DebugEntry->FileOffset = DebugEntry->RVA;
> }
> - if (ZeroDebugFlag || DebugEntry->Type != EFI_IMAGE_DEBUG_TYPE_CODEVIEW) {
> + if ((ZeroDebugFlag || DebugEntry->Type != EFI_IMAGE_DEBUG_TYPE_CODEVIEW) &&
> + (DebugEntry->Type != EFI_IMAGE_DEBUG_TYPE_EX_DLLCHARACTERISTICS)) {
> memset (FileBuffer + DebugEntry->FileOffset, 0, DebugEntry->SizeOfData);
> memset (DebugEntry, 0, sizeof (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY));
> }
> diff --git a/BaseTools/Source/C/Include/IndustryStandard/PeImage.h b/BaseTools/Source/C/Include/IndustryStandard/PeImage.h
> index 77ded3f611398278..5e9428ab98c7f68a 100644
> --- a/BaseTools/Source/C/Include/IndustryStandard/PeImage.h
> +++ b/BaseTools/Source/C/Include/IndustryStandard/PeImage.h
> @@ -615,7 +615,8 @@ typedef struct {
> ///
> /// Debug Format
> ///
> -#define EFI_IMAGE_DEBUG_TYPE_CODEVIEW 2
> +#define EFI_IMAGE_DEBUG_TYPE_CODEVIEW 2
> +#define EFI_IMAGE_DEBUG_TYPE_EX_DLLCHARACTERISTICS 20
>
> typedef struct {
> UINT32 Characteristics;
> @@ -664,6 +665,16 @@ typedef struct {
> //
> } EFI_IMAGE_DEBUG_CODEVIEW_MTOC_ENTRY;
>
> +///
> +/// Extended DLL Characteristics
> +///
> +#define EFI_IMAGE_DLLCHARACTERISTICS_EX_CET_COMPAT 0x0001
> +#define EFI_IMAGE_DLLCHARACTERISTICS_EX_FORWARD_CFI_COMPAT 0x0040
> +
> +typedef struct {
> + UINT16 DllCharacteristicsEx;
> +} EFI_IMAGE_DEBUG_EX_DLLCHARACTERISTICS_ENTRY;
> +
> //
> // .pdata entries for X64
> //
> --
> 2.39.2
>
[-- Attachment #2: Type: text/html, Size: 9310 bytes --]
next prev parent reply other threads:[~2023-03-27 15:46 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-27 11:00 [PATCH v2 00/17] Enable BTI support in memory attributes table Ard Biesheuvel
2023-03-27 11:00 ` [PATCH v2 01/17] MdePkg/ProcessorBind AARCH64: Add asm macro to emit GNU BTI note Ard Biesheuvel
2023-03-27 11:52 ` Leif Lindholm
2023-03-27 12:15 ` Ard Biesheuvel
2023-03-27 12:56 ` Leif Lindholm
2023-03-27 12:45 ` Leif Lindholm
2023-03-27 12:46 ` [edk2-devel] " Ard Biesheuvel
2023-03-27 12:49 ` Leif Lindholm
2023-03-27 14:12 ` Pedro Falcato
2023-03-27 14:24 ` Leif Lindholm
2023-03-30 7:28 ` Ard Biesheuvel
2023-03-30 10:47 ` Leif Lindholm
2023-03-27 11:00 ` [PATCH v2 02/17] MdePkg/BaseCpuLib AARCH64: Make asm files BTI compatible Ard Biesheuvel
2023-03-27 11:00 ` [PATCH v2 03/17] MdePkg/BaseIoLibIntrinsic " Ard Biesheuvel
2023-03-27 11:00 ` [PATCH v2 04/17] MdePkg/BaseLib AARCH64: Make LongJump() " Ard Biesheuvel
2023-03-27 11:01 ` [PATCH v2 05/17] MdePkg/BaseLib AARCH64: Make asm files " Ard Biesheuvel
2023-03-27 11:01 ` [PATCH v2 06/17] MdePkg/BaseMemoryLibOptDxe " Ard Biesheuvel
2023-03-27 11:01 ` [PATCH v2 07/17] MdePkg/BaseSynchronizationLib " Ard Biesheuvel
2023-03-27 11:01 ` [PATCH v2 08/17] MdePkg/BaseRngLib " Ard Biesheuvel
2023-03-27 11:01 ` [PATCH v2 09/17] ArmPkg: Emit BTI opcodes when BTI codegen is enabled Ard Biesheuvel
2023-03-27 11:01 ` [PATCH v2 10/17] ArmPkg/GccLto AARCH64: Add BTI note to LTO helper library Ard Biesheuvel
2023-03-27 11:01 ` [PATCH v2 11/17] ArmPkg, BaseTools AARCH64: Add BTI ELF note to .hii objects Ard Biesheuvel
2023-03-27 13:09 ` Leif Lindholm
2023-03-27 13:16 ` [edk2-devel] " Ard Biesheuvel
2023-03-27 11:01 ` [PATCH v2 12/17] ArmPlatformPkg/PrePeiCore: Make vector table object BTI compatible Ard Biesheuvel
2023-03-27 11:01 ` [PATCH v2 13/17] BaseTools/GenFw: Parse IBT/BTI support status from ELF note Ard Biesheuvel
2023-03-27 11:01 ` [PATCH v2 14/17] BaseTools/GenFw: Add DllCharacteristicsEx field to debug data Ard Biesheuvel
2023-03-27 15:46 ` Marvin Häuser [this message]
2023-03-27 16:41 ` Ard Biesheuvel
2023-03-27 11:01 ` [PATCH v2 15/17] MdePkg: Update MemoryAttributesTable to v2.10 Ard Biesheuvel
2023-03-27 13:29 ` Leif Lindholm
2023-03-29 16:47 ` [edk2-devel] " Ard Biesheuvel
2023-03-29 18:07 ` Leif Lindholm
2023-03-27 11:01 ` [PATCH v2 16/17] MdePkg/PeCoffLib: Capture DLL characteristics fieldis in image context Ard Biesheuvel
2023-03-30 14:44 ` [edk2-devel] " Michael Kubacki
2023-03-30 14:53 ` Ard Biesheuvel
2023-03-27 11:01 ` [PATCH v2 17/17] MdeModulePkg: Enable forward edge CFI in mem attributes table Ard Biesheuvel
2023-03-28 22:59 ` [edk2-devel] " Oliver Smith-Denny
2023-04-03 15:48 ` osde
2023-04-04 10:41 ` Ard Biesheuvel
2023-04-04 15:00 ` Oliver Smith-Denny
2023-04-04 15:30 ` Ard Biesheuvel
2023-03-27 11:43 ` [PATCH v2 00/17] Enable BTI support in memory " Leif Lindholm
2023-03-27 12:54 ` [edk2-devel] " Ard Biesheuvel
2023-03-27 13:37 ` Gerd Hoffmann
2023-03-28 23:00 ` Oliver Smith-Denny
2023-03-29 16:31 ` Leif Lindholm
2023-03-30 7:41 ` [edk2-devel] " Ard Biesheuvel
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-list 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=49927D70-11BA-4B5D-93B5-764A853F2ED0@posteo.de \
--to=devel@edk2.groups.io \
/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