narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[efi] Place PE debug information in a hidden section 

The PE debug information generated by elf2efi is used only to hold the
image filename, and the debug information is located via the relevant
data directory entry rather than via the section table.

Make the .debug section a hidden section in order to save one entry in
the PE section list.  Choose to place the debug information in the
unused space at the end of the PE headers, since it no longer needs to
satisfy the general section alignment constraints.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
pull/1082/head
Michael Brown 2023-11-23 14:17:36 +00:00
parent b37d89db90
commit 6714b20ea2
1 changed files with 15 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/util/elf2efi.c
View File

@ -185,7 +185,6 @@ struct elf_file {
struct pe_section { struct pe_section {
struct pe_section *next; struct pe_section *next;
EFI_IMAGE_SECTION_HEADER hdr; EFI_IMAGE_SECTION_HEADER hdr;
void ( * fixup ) ( struct pe_section *section );
int hidden; int hidden;
uint8_t contents[0]; uint8_t contents[0];
}; };
@ -919,20 +918,6 @@ create_reloc_section ( struct pe_header *pe_header,
return reloc; return reloc;
} }
/**
* Fix up debug section
*
* @v debug Debug section
*/
static void fixup_debug_section ( struct pe_section *debug ) {
EFI_IMAGE_DEBUG_DIRECTORY_ENTRY *contents;
/* Fix up FileOffset */
contents = ( ( void * ) debug->contents );
contents->FileOffset += ( debug->hdr.PointerToRawData -
debug->hdr.VirtualAddress );
}
/** /**
* Create debug section * Create debug section
* *
@ -952,24 +937,27 @@ create_debug_section ( struct pe_header *pe_header, const char *filename ) {
} *contents; } *contents;
/* Allocate PE section */ /* Allocate PE section */
section_memsz = sizeof ( *contents ); section_filesz = section_memsz = sizeof ( *contents );
section_filesz = efi_file_align ( section_memsz );
debug = xmalloc ( sizeof ( *debug ) + section_filesz ); debug = xmalloc ( sizeof ( *debug ) + section_filesz );
memset ( debug, 0, sizeof ( *debug ) + section_filesz ); memset ( debug, 0, sizeof ( *debug ) + section_filesz );
contents = ( void * ) debug->contents; contents = ( void * ) debug->contents;
/* Place at end of headers */
pe_header->nt.OptionalHeader.SizeOfHeaders += sizeof ( *contents );
pe_header->nt.OptionalHeader.SizeOfHeaders =
efi_file_align ( pe_header->nt.OptionalHeader.SizeOfHeaders );
pe_header->nt.OptionalHeader.SizeOfHeaders -= sizeof ( *contents );
/* Fill in section header details */ /* Fill in section header details */
strncpy ( ( char * ) debug->hdr.Name, ".debug", strncpy ( ( char * ) debug->hdr.Name, ".debug",
sizeof ( debug->hdr.Name ) ); sizeof ( debug->hdr.Name ) );
debug->hdr.Misc.VirtualSize = section_memsz; debug->hdr.Misc.VirtualSize = section_memsz;
debug->hdr.VirtualAddress = pe_header->nt.OptionalHeader.SizeOfImage; debug->hdr.VirtualAddress =
pe_header->nt.OptionalHeader.SizeOfHeaders;
debug->hdr.SizeOfRawData = section_filesz; debug->hdr.SizeOfRawData = section_filesz;
debug->hdr.PointerToRawData = PTRD_AUTO; debug->hdr.PointerToRawData =
debug->hdr.Characteristics = ( EFI_IMAGE_SCN_CNT_INITIALIZED_DATA | pe_header->nt.OptionalHeader.SizeOfHeaders;
EFI_IMAGE_SCN_MEM_DISCARDABLE | debug->hidden = 1;
EFI_IMAGE_SCN_MEM_NOT_PAGED |
EFI_IMAGE_SCN_MEM_READ );
debug->fixup = fixup_debug_section;
/* Create section contents */ /* Create section contents */
contents->debug.TimeDateStamp = 0x10d1a884; contents->debug.TimeDateStamp = 0x10d1a884;
@ -984,10 +972,7 @@ create_debug_section ( struct pe_header *pe_header, const char *filename ) {
filename ); filename );
/* Update file header details */ /* Update file header details */
pe_header->nt.FileHeader.NumberOfSections++; pe_header->nt.OptionalHeader.SizeOfHeaders += sizeof ( *contents );
pe_header->nt.OptionalHeader.SizeOfHeaders += sizeof ( debug->hdr );
pe_header->nt.OptionalHeader.SizeOfImage +=
efi_image_align ( section_memsz );
debugdir = &(pe_header->nt.OptionalHeader.DataDirectory debugdir = &(pe_header->nt.OptionalHeader.DataDirectory
[EFI_IMAGE_DIRECTORY_ENTRY_DEBUG]); [EFI_IMAGE_DIRECTORY_ENTRY_DEBUG]);
debugdir->VirtualAddress = debug->hdr.VirtualAddress; debugdir->VirtualAddress = debug->hdr.VirtualAddress;
@ -1027,13 +1012,12 @@ static void write_pe_file ( struct pe_header *pe_header,
fpos = efi_file_align ( fpos ); fpos = efi_file_align ( fpos );
if ( fpos > fposmax ) if ( fpos > fposmax )
fposmax = fpos; fposmax = fpos;
if ( section->fixup )
section->fixup ( section );
} }
/* Write sections */ /* Write sections */
for ( section = pe_sections ; section ; section = section->next ) { for ( section = pe_sections ; section ; section = section->next ) {
if ( section->hdr.PointerToRawData & ( EFI_FILE_ALIGN - 1 ) ) { if ( ( section->hdr.PointerToRawData & ( EFI_FILE_ALIGN - 1 ) )
&& ( ! section->hidden ) ) {
eprintf ( "Section %.8s file offset %x is " eprintf ( "Section %.8s file offset %x is "
"misaligned\n", section->hdr.Name, "misaligned\n", section->hdr.Name,
section->hdr.PointerToRawData ); section->hdr.PointerToRawData );