proxmox-mirrors/efi-boot-shim
1
0
Fork 0
mirror of https://git.proxmox.com/git/efi-boot-shim synced 2025-07-04 19:57:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use the file size, not the image size field, for verification.

Browse Source
This commit is contained in:
Matthew Garrett 2012-09-06 12:13:44 -04:00 committed by Peter Jones
parent 8518b8cc1f
commit ce78d2d250
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
shim.c
View File

@ -555,7 +555,7 @@ done:
/* /*
* Read the binary header and grab appropriate information from it * Read the binary header and grab appropriate information from it
*/ */
static EFI_STATUS read_header(void *data, static EFI_STATUS read_header(void *data, unsigned int datasize,
PE_COFF_LOADER_IMAGE_CONTEXT *context) PE_COFF_LOADER_IMAGE_CONTEXT *context)
{ {
EFI_IMAGE_DOS_HEADER *DosHdr = data; EFI_IMAGE_DOS_HEADER *DosHdr = data;
@ -590,7 +590,7 @@ static EFI_STATUS read_header(void *data,
context->FirstSection = (EFI_IMAGE_SECTION_HEADER *)((char *)PEHdr + PEHdr->Pe32.FileHeader.SizeOfOptionalHeader + sizeof(UINT32) + sizeof(EFI_IMAGE_FILE_HEADER)); context->FirstSection = (EFI_IMAGE_SECTION_HEADER *)((char *)PEHdr + PEHdr->Pe32.FileHeader.SizeOfOptionalHeader + sizeof(UINT32) + sizeof(EFI_IMAGE_FILE_HEADER));
context->SecDir = (EFI_IMAGE_DATA_DIRECTORY *) &PEHdr->Pe32Plus.OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_SECURITY]; context->SecDir = (EFI_IMAGE_DATA_DIRECTORY *) &PEHdr->Pe32Plus.OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_SECURITY];
if (context->SecDir->VirtualAddress >= context->ImageSize) { if (context->SecDir->VirtualAddress >= datasize) {
Print(L"Malformed security header\n"); Print(L"Malformed security header\n");
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
} }
@ -606,7 +606,8 @@ static EFI_STATUS read_header(void *data,
/* /*
* Once the image has been loaded it needs to be validated and relocated * Once the image has been loaded it needs to be validated and relocated
*/ */
static EFI_STATUS handle_grub (void *data, int datasize, EFI_LOADED_IMAGE *li) static EFI_STATUS handle_grub (void *data, unsigned int datasize,
EFI_LOADED_IMAGE *li)
{ {
EFI_STATUS efi_status; EFI_STATUS efi_status;
char *buffer; char *buffer;
@ -615,7 +616,7 @@ static EFI_STATUS handle_grub (void *data, int datasize, EFI_LOADED_IMAGE *li)
char *base, *end; char *base, *end;
PE_COFF_LOADER_IMAGE_CONTEXT context; PE_COFF_LOADER_IMAGE_CONTEXT context;
efi_status = read_header(data, &context); efi_status = read_header(data, datasize, &context);
if (efi_status != EFI_SUCCESS) { if (efi_status != EFI_SUCCESS) {
Print(L"Failed to read header\n"); Print(L"Failed to read header\n");
return efi_status; return efi_status;
@ -843,7 +844,7 @@ EFI_STATUS shim_verify (void *buffer, UINT32 size)
if (!secure_mode()) if (!secure_mode())
return EFI_SUCCESS; return EFI_SUCCESS;
status = read_header(buffer, &context); status = read_header(buffer, size, &context);
if (status != EFI_SUCCESS) if (status != EFI_SUCCESS)
return status; return status;