efi: Fix .data section size calculations when .sbat is present
PATCH v2 1/1 efi: Fix .data section size calculations when .sbat is present
Commit 0f9a1739dd0e ("efi: zboot specific mechanism for embedding SBAT section") neglected to adjust the sizes of the .data section when CONFIG_EFI_SBAT_FILE is set. As the result, the produced PE binary is incorrect and some tools complain about it. E.g. 'sbsign' reports:
# sbsign --key my.key --cert my.crt arch/arm64/boot/vmlinuz.efi warning: file-aligned section .data extends beyond end of file warning: checksum areas are greater than image size. Invalid section table?
Note, '__data_size' is also used in the PE optional header and it is not entirely clear whether .sbat needs to be accounted as part of SizeOfInitializedData or not. As the header seems to be unused by the real world firmware, keeping the field equal to __data_size.
---
Changes in v2: drop PE optional header adjustment [Ard]
--- drivers/firmware/efi/libstub/zboot.lds | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/firmware/efi/libstub/zboot.lds +2 -2
@@ -58,6 +58,6 @@ SECTIONS PROVIDE(__efistub__gzdata_size = ABSOLUTE(__efistub__gzdata_end - __efistub__gzdata_start)); -PROVIDE(__data_rawsize = ABSOLUTE(_edata - _etext)); -PROVIDE(__data_size = ABSOLUTE(_end - _etext)); +PROVIDE(__data_rawsize = ABSOLUTE(_edata - _data)); +PROVIDE(__data_size = ABSOLUTE(_end - _data)); PROVIDE(__sbat_size = ABSOLUTE(_esbat - _sbat));
Signature · 1 line
2.49.0
Ard Biesheuvel
maintainerQuoted 38 lines · Vitaly Kuznetsov
Commit
0f9a1739dd0e("efi: zboot specific mechanism for embedding SBAT section") neglected to adjust the sizes of the .data section whenCONFIG_EFI_SBAT_FILEis set. As the result, the produced PE binary is incorrect and some tools complain about it. E.g. 'sbsign' reports:# sbsign --key my.key --cert my.crt arch/arm64/boot/vmlinuz.efi warning: file-aligned section .data extends beyond end of file warning: checksum areas are greater than image size. Invalid section table?Note, '
__data_size' is also used in the PE optional header and it is not entirely clear whether .sbat needs to be accounted as part of SizeOfInitializedData or not. As the header seems to be unused by the real world firmware, keeping the field equal to__data_size.Fixes 0f9a1739dd0e ("efi: zboot specific mechanism for embedding SBAT section")Reported-by Heinrich Schuchardt <[email protected]>Signed-off-by Vitaly Kuznetsov <[email protected]>---
Changes in v2: drop PE optional header adjustment [Ard]--- drivers/firmware/efi/libstub/zboot.lds | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/firmware/efi/libstub/zboot.lds +2
-3@@ -58,6 +58,6 @@ SECTIONS PROVIDE(__efistub__gzdata_size = ABSOLUTE(__efistub__gzdata_end - __efistub__gzdata_start)); -PROVIDE(__data_rawsize = ABSOLUTE(_edata - _etext)); -PROVIDE(__data_size = ABSOLUTE(_end - _etext)); +PROVIDE(__data_rawsize = ABSOLUTE(_edata - _data)); +PROVIDE(__data_size = ABSOLUTE(_end - _data)); PROVIDE(__sbat_size = ABSOLUTE(_esbat - _sbat)); --
Quoted 3 lines
2.49.0
Thanks, I've queued this up now.