mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-08-08 02:40:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[metal] Fix argc & argv[] setting, & VM page freeing, for UEFI

Browse source 
Part of the memory occupied by the argv[] contents was
erroneously used for page tables & then later erroneously
freed.  The symptom was that argv[0] would show up as an
empty string ("").
This commit is contained in:
tkchia 2023-05-29 20:19:57 +00:00
parent 680c004f4a
commit c9b57f1fac
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libc/runtime/efimain.greg.c
View file

@ -172,7 +172,7 @@ __msabi noasan EFI_STATUS EfiMain(EFI_HANDLE ImageHandle,
Address = 0x79000; Address = 0x79000;
SystemTable->BootServices->AllocatePages( SystemTable->BootServices->AllocatePages(
AllocateAddress, EfiRuntimeServicesData, AllocateAddress, EfiRuntimeServicesData,
(0x7e000 - 0x79000 + sizeof(struct EfiArgs) + 4095) / 4096, &Address); (0x7f000 - 0x79000 + sizeof(struct EfiArgs) + 4095) / 4096, &Address);
Address = IMAGE_BASE_PHYSICAL; Address = IMAGE_BASE_PHYSICAL;
SystemTable->BootServices->AllocatePages( SystemTable->BootServices->AllocatePages(
AllocateAddress, EfiRuntimeServicesData, AllocateAddress, EfiRuntimeServicesData,
@ -180,7 +180,7 @@ __msabi noasan EFI_STATUS EfiMain(EFI_HANDLE ImageHandle,
mm = (struct mman *)0x0500; mm = (struct mman *)0x0500;
SystemTable->BootServices->SetMem(mm, sizeof(*mm), 0); SystemTable->BootServices->SetMem(mm, sizeof(*mm), 0);
SystemTable->BootServices->SetMem( SystemTable->BootServices->SetMem(
(void *)0x79000, 0x7e000 - 0x79000 + sizeof(struct EfiArgs), 0); (void *)0x79000, 0x7f000 - 0x79000 + sizeof(struct EfiArgs), 0);
SystemTable->BootServices->CopyMem((void *)IMAGE_BASE_PHYSICAL, SystemTable->BootServices->CopyMem((void *)IMAGE_BASE_PHYSICAL,
__executable_start, __executable_start,
_end - __executable_start); _end - __executable_start);
@ -188,7 +188,7 @@ __msabi noasan EFI_STATUS EfiMain(EFI_HANDLE ImageHandle,
/* /*
* Converts UEFI shell arguments to argv. * Converts UEFI shell arguments to argv.
*/ */
ArgBlock = (struct EfiArgs *)0x7e000; ArgBlock = (struct EfiArgs *)0x7f000;
SystemTable->BootServices->HandleProtocol(ImageHandle, SystemTable->BootServices->HandleProtocol(ImageHandle,
&kEfiLoadedImageProtocol, &ImgInfo); &kEfiLoadedImageProtocol, &ImgInfo);
CmdLine = (const char16_t *)ImgInfo->LoadOptions; CmdLine = (const char16_t *)ImgInfo->LoadOptions;