| Message ID | 1486554947-3964-6-git-send-email-ard.biesheuvel@linaro.org |
|---|---|
| State | Accepted |
| Commit | f328ba470c9ec282d7bbcc151c8dd19fff7513c3 |
| Headers | show |
| Series | arm64+ARM: efi: PE/COFF cleanup/hardening | expand |
On Wed, Feb 08, 2017 at 11:55:38AM +0000, Ard Biesheuvel wrote: > Bring the PE/COFF header in line with the PE/COFF spec, by setting > NumberOfSymbols to 0, and removing the section alignment flags. > > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> I take it that in practice EFI implementations don't care about these? Assuming so: Acked-by: Mark Rutland <mark.rutland@arm.com> Otherwise, we might want to fix this first, so that we can easily backport it. Thanks, Mark. > --- > arch/arm64/kernel/efi-header.S | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arch/arm64/kernel/efi-header.S b/arch/arm64/kernel/efi-header.S > index 9b24ce130afb..515624bbfcd0 100644 > --- a/arch/arm64/kernel/efi-header.S > +++ b/arch/arm64/kernel/efi-header.S > @@ -15,7 +15,7 @@ coff_header: > .short 2 // nr_sections > .long 0 // TimeDateStamp > .long 0 // PointerToSymbolTable > - .long 1 // NumberOfSymbols > + .long 0 // NumberOfSymbols > .short section_table - optional_header // SizeOfOptionalHeader > .short 0x206 // Characteristics. > // IMAGE_FILE_DEBUG_STRIPPED | > @@ -88,7 +88,7 @@ section_table: > .long 0 // PointerToLineNumbers > .short 0 // NumberOfRelocations > .short 0 // NumberOfLineNumbers > - .long 0x42100040 // Characteristics (section flags) > + .long 0x42000040 // Characteristics (section flags) > > > .ascii ".text" > @@ -104,7 +104,7 @@ section_table: > .long 0 // PointerToLineNumbers > .short 0 // NumberOfRelocations > .short 0 // NumberOfLineNumbers > - .long 0xe0500020 // Characteristics > + .long 0xe0000020 // Characteristics > > #ifdef CONFIG_DEBUG_EFI > /* > -- > 2.7.4 > -- To unsubscribe from this list: send the line "unsubscribe linux-efi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 10 February 2017 at 10:13, Mark Rutland <mark.rutland@arm.com> wrote: > On Wed, Feb 08, 2017 at 11:55:38AM +0000, Ard Biesheuvel wrote: >> Bring the PE/COFF header in line with the PE/COFF spec, by setting >> NumberOfSymbols to 0, and removing the section alignment flags. >> >> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> > > I take it that in practice EFI implementations don't care about these? Not at all. I just spotted it when I was cleaning up the header. > Assuming so: > > Acked-by: Mark Rutland <mark.rutland@arm.com> > > Otherwise, we might want to fix this first, so that we can easily > backport it. > I wouldn't bother -- To unsubscribe from this list: send the line "unsubscribe linux-efi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm64/kernel/efi-header.S b/arch/arm64/kernel/efi-header.S index 9b24ce130afb..515624bbfcd0 100644 --- a/arch/arm64/kernel/efi-header.S +++ b/arch/arm64/kernel/efi-header.S @@ -15,7 +15,7 @@ coff_header: .short 2 // nr_sections .long 0 // TimeDateStamp .long 0 // PointerToSymbolTable - .long 1 // NumberOfSymbols + .long 0 // NumberOfSymbols .short section_table - optional_header // SizeOfOptionalHeader .short 0x206 // Characteristics. // IMAGE_FILE_DEBUG_STRIPPED | @@ -88,7 +88,7 @@ section_table: .long 0 // PointerToLineNumbers .short 0 // NumberOfRelocations .short 0 // NumberOfLineNumbers - .long 0x42100040 // Characteristics (section flags) + .long 0x42000040 // Characteristics (section flags) .ascii ".text" @@ -104,7 +104,7 @@ section_table: .long 0 // PointerToLineNumbers .short 0 // NumberOfRelocations .short 0 // NumberOfLineNumbers - .long 0xe0500020 // Characteristics + .long 0xe0000020 // Characteristics #ifdef CONFIG_DEBUG_EFI /*
Bring the PE/COFF header in line with the PE/COFF spec, by setting NumberOfSymbols to 0, and removing the section alignment flags. Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> --- arch/arm64/kernel/efi-header.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-efi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html