tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-28 16:14:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Core/Dxe: Added sanity checks.

Browse Source
This commit is contained in:
Mikhail Krichanov 2025-01-27 15:37:19 +03:00
parent 5c919d20d9
commit e358acb6d9
7 changed files with 191 additions and 245 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
MdeModulePkg/Core/Dxe/Image/Image.c
View File

@ -1706,21 +1706,25 @@ CoreStartImage (
gUserPageTable = Image->UserPageTable; gUserPageTable = Image->UserPageTable;
UserDriver = AllocatePool (sizeof (USER_SPACE_DRIVER)); UserDriver = AllocatePool (sizeof (USER_SPACE_DRIVER));
UserDriver->CoreWrapper = NULL; if (UserDriver != NULL) {
UserDriver->UserSpaceDriver = (VOID *)Image->EntryPoint; UserDriver->CoreWrapper = NULL;
UserDriver->UserPageTable = Image->UserPageTable; UserDriver->UserSpaceDriver = (VOID *)Image->EntryPoint;
UserDriver->NumberOfCalls = 0; UserDriver->UserPageTable = Image->UserPageTable;
UserDriver->NumberOfCalls = 0;
InsertTailList (&gUserSpaceDriversHead, &UserDriver->Link); InsertTailList (&gUserSpaceDriversHead, &UserDriver->Link);
Image->Status = GoToRing3 ( Image->Status = GoToRing3 (
2, 2,
(VOID *)Image->EntryPoint, (VOID *)Image->EntryPoint,
UserDriver, UserDriver,
ImageHandle, ImageHandle,
gRing3Data gRing3Data
); );
} else {
Image->Status = EFI_OUT_OF_RESOURCES;
}
} }
} else { } else {
Image->Status = Image->EntryPoint (ImageHandle, Image->Info.SystemTable); Image->Status = Image->EntryPoint (ImageHandle, Image->Info.SystemTable);

2
MdeModulePkg/Core/Dxe/SysCall/AARCH64/CoreBootServices.S
View File

@ -15,7 +15,7 @@
// CallInstallMultipleProtocolInterfaces ( // CallInstallMultipleProtocolInterfaces (
// IN EFI_HANDLE *Handle, // IN EFI_HANDLE *Handle,
// IN VOID **ArgList, // IN VOID **ArgList,
// IN UINT32 ArgListSize, // IN UINTN ArgListSize,
// IN VOID *Function // IN VOID *Function
// ); // );
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------

2
MdeModulePkg/Core/Dxe/SysCall/ARM/CoreBootServices.S
View File

@ -13,7 +13,7 @@
// CallInstallMultipleProtocolInterfaces ( // CallInstallMultipleProtocolInterfaces (
// IN EFI_HANDLE *Handle, // IN EFI_HANDLE *Handle,
// IN VOID **ArgList, // IN VOID **ArgList,
// IN UINT32 ArgListSize, // IN UINTN ArgListSize,
// IN VOID *Function // IN VOID *Function
// ); // );
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------

332
MdeModulePkg/Core/Dxe/SysCall/BootServices.c
View File

@ -61,7 +61,7 @@ EFIAPI
CallInstallMultipleProtocolInterfaces ( CallInstallMultipleProtocolInterfaces (
IN EFI_HANDLE *Handle, IN EFI_HANDLE *Handle,
IN VOID **ArgList, IN VOID **ArgList,
IN UINT32 ArgListSize, IN UINTN ArgListSize,
IN VOID *Function IN VOID *Function
); );
@ -300,32 +300,9 @@ CopyUserArguments (
); );
ForbidSupervisorAccessToUserMemory (); ForbidSupervisorAccessToUserMemory ();
ASSERT (Arguments != NULL);
return Arguments; return Arguments;
} }
STATIC
USER_SPACE_DRIVER *
EFIAPI
FindUserInfo (
VOID
)
{
LIST_ENTRY *Link;
USER_SPACE_DRIVER *UserDriver;
for (Link = gUserSpaceDriversHead.ForwardLink; Link != &gUserSpaceDriversHead; Link = Link->ForwardLink) {
UserDriver = BASE_CR (Link, USER_SPACE_DRIVER, Link);
if (UserDriver->UserPageTable == gUserPageTable) {
return UserDriver;
}
}
return NULL;
}
STATIC STATIC
VOID VOID
EFIAPI EFIAPI
@ -366,13 +343,12 @@ CallBootService (
UINTN Argument4; UINTN Argument4;
UINTN Argument5; UINTN Argument5;
UINTN Argument6; UINTN Argument6;
UINT32 Index; UINTN Index;
VOID **UserArgList; VOID **UserArgList;
VOID **CoreArgList; VOID **CoreArgList;
EFI_HANDLE CoreHandle; EFI_HANDLE CoreHandle;
UINT32 PagesNumber; UINT32 PagesNumber;
EFI_PHYSICAL_ADDRESS Ring3Pages; EFI_PHYSICAL_ADDRESS Ring3Pages;
USER_SPACE_DRIVER *UserDriver;
USER_SPACE_DRIVER *NewDriver; USER_SPACE_DRIVER *NewDriver;
UINTN *Arguments; UINTN *Arguments;
EFI_PHYSICAL_ADDRESS PhysAddr; EFI_PHYSICAL_ADDRESS PhysAddr;
@ -392,18 +368,22 @@ CallBootService (
Interface = NULL; Interface = NULL;
Arguments = CopyUserArguments (NumberOfArguments, UserArguments); Arguments = CopyUserArguments (NumberOfArguments, UserArguments);
if (Arguments == NULL) {
return EFI_OUT_OF_RESOURCES;
}
DEBUG ((DEBUG_VERBOSE, "Type: %a\n", SysCallNames[Type])); DEBUG ((DEBUG_VERBOSE, "Type: %a\n", SysCallNames[Type]));
switch (Type) { switch (Type) {
case SysCallReturnToCore: case SysCallReturnToCore:
// //
// Argument 1: EFI_STATUS Status // Argument 1: EFI_STATUS Status
// Argument 2: UINTN ReturnSP // Argument 2: UINTN ReturnSP
// //
Status = (EFI_STATUS)Arguments[1]; Status = (EFI_STATUS)Arguments[1];
FreePool (Arguments); FreePool (Arguments);
ReturnToCore (Status, ReturnSP); ReturnToCore (Status, ReturnSP);
break; break;
case SysCallLocateProtocol: case SysCallLocateProtocol:
@ -425,8 +405,7 @@ CallBootService (
Status = FindGuid ((EFI_GUID *)Arguments[1], &CoreProtocol, &MemoryCoreSize); Status = FindGuid ((EFI_GUID *)Arguments[1], &CoreProtocol, &MemoryCoreSize);
ForbidSupervisorAccessToUserMemory (); ForbidSupervisorAccessToUserMemory ();
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
FreePool (Arguments); break;
return Status;
} }
Status = gBS->LocateProtocol ( Status = gBS->LocateProtocol (
@ -444,9 +423,7 @@ CallBootService (
} }
ForbidSupervisorAccessToUserMemory (); ForbidSupervisorAccessToUserMemory ();
FreePool (Arguments); break;
return Status;
case SysCallOpenProtocol: case SysCallOpenProtocol:
// //
// Argument 1: EFI_HANDLE CoreUserHandle // Argument 1: EFI_HANDLE CoreUserHandle
@ -471,8 +448,7 @@ CallBootService (
Status = FindGuid ((EFI_GUID *)Arguments[2], &CoreProtocol, &MemoryCoreSize); Status = FindGuid ((EFI_GUID *)Arguments[2], &CoreProtocol, &MemoryCoreSize);
ForbidSupervisorAccessToUserMemory (); ForbidSupervisorAccessToUserMemory ();
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
FreePool (Arguments); break;
return Status;
} }
Status = gBS->OpenProtocol ( Status = gBS->OpenProtocol (
@ -494,9 +470,7 @@ CallBootService (
ForbidSupervisorAccessToUserMemory (); ForbidSupervisorAccessToUserMemory ();
} }
FreePool (Arguments); break;
return Status;
case SysCallInstallMultipleProtocolInterfaces: case SysCallInstallMultipleProtocolInterfaces:
// //
// Argument 1: EFI_HANDLE *Handle // Argument 1: EFI_HANDLE *Handle
@ -513,6 +487,10 @@ CallBootService (
ASSERT ((Attributes & EFI_MEMORY_USER) != 0); ASSERT ((Attributes & EFI_MEMORY_USER) != 0);
CoreArgList = AllocatePool (Arguments[2] * sizeof (VOID *)); CoreArgList = AllocatePool (Arguments[2] * sizeof (VOID *));
if (CoreArgList == NULL) {
Status = EFI_OUT_OF_RESOURCES;
break;
}
AllowSupervisorAccessToUserMemory (); AllowSupervisorAccessToUserMemory ();
CoreHandle = *(EFI_HANDLE *)Arguments[1]; CoreHandle = *(EFI_HANDLE *)Arguments[1];
@ -526,17 +504,7 @@ CallBootService (
Status = FindGuid ((EFI_GUID *)UserArgList[Index], (EFI_GUID **)&CoreArgList[Index], &MemoryCoreSize); Status = FindGuid ((EFI_GUID *)UserArgList[Index], (EFI_GUID **)&CoreArgList[Index], &MemoryCoreSize);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
ForbidSupervisorAccessToUserMemory (); goto Exit;
while (Index > 0) {
FreeUserSpaceDriver (CoreArgList[Index - 1]);
FreePool (CoreArgList[Index - 1]);
Index -= 2;
}
FreePool (CoreArgList);
FreePool (Arguments);
return Status;
} }
gCpu->GetMemoryAttributes (gCpu, (EFI_PHYSICAL_ADDRESS)(UINTN)UserArgList[Index + 1], &Attributes); gCpu->GetMemoryAttributes (gCpu, (EFI_PHYSICAL_ADDRESS)(UINTN)UserArgList[Index + 1], &Attributes);
@ -545,16 +513,20 @@ CallBootService (
ASSERT ((Attributes & EFI_MEMORY_USER) != 0); ASSERT ((Attributes & EFI_MEMORY_USER) != 0);
CoreArgList[Index + 1] = AllocateCopyPool (MemoryCoreSize, (VOID *)UserArgList[Index + 1]); CoreArgList[Index + 1] = AllocateCopyPool (MemoryCoreSize, (VOID *)UserArgList[Index + 1]);
if (CoreArgList[Index + 1] == NULL) {
Status = EFI_OUT_OF_RESOURCES;
goto Exit;
}
NewDriver = AllocatePool (sizeof (USER_SPACE_DRIVER));
if (NewDriver == NULL) {
Status = EFI_OUT_OF_RESOURCES;
goto Exit;
}
UserDriver = FindUserInfo ();
ASSERT (UserDriver != NULL);
//
// TODO: Check everywhere that Allocated != NULL
//
NewDriver = AllocatePool (sizeof (USER_SPACE_DRIVER));
NewDriver->CoreWrapper = CoreArgList[Index + 1]; NewDriver->CoreWrapper = CoreArgList[Index + 1];
NewDriver->UserSpaceDriver = UserArgList[Index + 1]; NewDriver->UserSpaceDriver = UserArgList[Index + 1];
NewDriver->UserPageTable = UserDriver->UserPageTable; NewDriver->UserPageTable = gUserPageTable;
NewDriver->NumberOfCalls = 0; NewDriver->NumberOfCalls = 0;
InsertTailList (&gUserSpaceDriversHead, &NewDriver->Link); InsertTailList (&gUserSpaceDriversHead, &NewDriver->Link);
@ -591,20 +563,35 @@ CallBootService (
(VOID *)CoreUnicodeCollation->SupportedLanguages (VOID *)CoreUnicodeCollation->SupportedLanguages
); );
ForbidSupervisorAccessToUserMemory (); ForbidSupervisorAccessToUserMemory ();
if (CoreUnicodeCollation->SupportedLanguages == NULL) {
Status = EFI_OUT_OF_RESOURCES;
Index = Arguments[2] - 1;
goto Exit;
}
} }
} }
Status = CallInstallMultipleProtocolInterfaces ( Status = CallInstallMultipleProtocolInterfaces (
&CoreHandle, &CoreHandle,
CoreArgList, CoreArgList,
Index + 1, Arguments[2],
(VOID *)gBS->InstallMultipleProtocolInterfaces (VOID *)gBS->InstallMultipleProtocolInterfaces
); );
FreePool (CoreArgList); FreePool (CoreArgList);
FreePool (Arguments); break;
return Status;
Exit:
ForbidSupervisorAccessToUserMemory ();
while (Index > 0) {
FreeUserSpaceDriver (CoreArgList[Index - 1]);
FreePool (CoreArgList[Index - 1]);
Index -= 2;
}
FreePool (CoreArgList);
break;
case SysCallCloseProtocol: case SysCallCloseProtocol:
// //
// Argument 1: EFI_HANDLE CoreUserHandle // Argument 1: EFI_HANDLE CoreUserHandle
@ -621,8 +608,7 @@ CallBootService (
Status = FindGuid ((EFI_GUID *)Arguments[2], &CoreProtocol, &MemoryCoreSize); Status = FindGuid ((EFI_GUID *)Arguments[2], &CoreProtocol, &MemoryCoreSize);
ForbidSupervisorAccessToUserMemory (); ForbidSupervisorAccessToUserMemory ();
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
FreePool (Arguments); break;
return Status;
} }
Status = gBS->CloseProtocol ( Status = gBS->CloseProtocol (
@ -632,9 +618,7 @@ CallBootService (
(EFI_HANDLE)Arguments[4] (EFI_HANDLE)Arguments[4]
); );
FreePool (Arguments); break;
return Status;
case SysCallHandleProtocol: case SysCallHandleProtocol:
// //
// Argument 1: EFI_HANDLE CoreUserHandle // Argument 1: EFI_HANDLE CoreUserHandle
@ -654,8 +638,7 @@ CallBootService (
Status = FindGuid ((EFI_GUID *)Arguments[2], &CoreProtocol, &MemoryCoreSize); Status = FindGuid ((EFI_GUID *)Arguments[2], &CoreProtocol, &MemoryCoreSize);
ForbidSupervisorAccessToUserMemory (); ForbidSupervisorAccessToUserMemory ();
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
FreePool (Arguments); break;
return Status;
} }
Status = gBS->HandleProtocol ( Status = gBS->HandleProtocol (
@ -673,9 +656,7 @@ CallBootService (
} }
ForbidSupervisorAccessToUserMemory (); ForbidSupervisorAccessToUserMemory ();
FreePool (Arguments); break;
return Status;
case SysCallAllocatePages: case SysCallAllocatePages:
// //
// Argument 1: EFI_ALLOCATE_TYPE Type // Argument 1: EFI_ALLOCATE_TYPE Type
@ -699,9 +680,7 @@ CallBootService (
*(EFI_PHYSICAL_ADDRESS *)Arguments[4] = (EFI_PHYSICAL_ADDRESS)Argument4; *(EFI_PHYSICAL_ADDRESS *)Arguments[4] = (EFI_PHYSICAL_ADDRESS)Argument4;
ForbidSupervisorAccessToUserMemory (); ForbidSupervisorAccessToUserMemory ();
FreePool (Arguments); break;
return Status;
case SysCallFreePages: case SysCallFreePages:
// //
// Argument 1: UINTN NumberOfPages // Argument 1: UINTN NumberOfPages
@ -716,27 +695,22 @@ CallBootService (
Status = gBS->FreePages (PhysAddr, Arguments[1]); Status = gBS->FreePages (PhysAddr, Arguments[1]);
FreePool (Arguments); break;
return Status;
case SysCallRaiseTpl: case SysCallRaiseTpl:
// //
// Argument 1: EFI_TPL NewTpl // Argument 1: EFI_TPL NewTpl
// //
Status = (EFI_STATUS)gBS->RaiseTPL ((EFI_TPL)Arguments[1]); Status = (EFI_STATUS)gBS->RaiseTPL ((EFI_TPL)Arguments[1]);
FreePool (Arguments); break;
return Status;
case SysCallRestoreTpl: case SysCallRestoreTpl:
// //
// Argument 1: EFI_TPL NewTpl // Argument 1: EFI_TPL NewTpl
// //
gBS->RestoreTPL ((EFI_TPL)Arguments[1]); gBS->RestoreTPL ((EFI_TPL)Arguments[1]);
FreePool (Arguments); Status = EFI_SUCCESS;
return EFI_SUCCESS; break;
case SysCallLocateHandleBuffer: case SysCallLocateHandleBuffer:
// //
// Argument 1: EFI_LOCATE_SEARCH_TYPE SearchType // Argument 1: EFI_LOCATE_SEARCH_TYPE SearchType
@ -755,8 +729,7 @@ CallBootService (
Status = FindGuid ((EFI_GUID *)Arguments[2], &CoreProtocol, &MemoryCoreSize); Status = FindGuid ((EFI_GUID *)Arguments[2], &CoreProtocol, &MemoryCoreSize);
ForbidSupervisorAccessToUserMemory (); ForbidSupervisorAccessToUserMemory ();
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
FreePool (Arguments); break;
return Status;
} }
} }
@ -794,8 +767,7 @@ CallBootService (
&Ring3Pages &Ring3Pages
); );
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
FreePool (Arguments); break;
return Status;
} }
AllowSupervisorAccessToUserMemory (); AllowSupervisorAccessToUserMemory ();
@ -807,9 +779,8 @@ CallBootService (
ForbidSupervisorAccessToUserMemory (); ForbidSupervisorAccessToUserMemory ();
} }
FreePool (Arguments); Status = StatusBS;
return StatusBS; break;
case SysCallCalculateCrc32: case SysCallCalculateCrc32:
// //
// Argument 1: VOID *Data // Argument 1: VOID *Data
@ -827,8 +798,8 @@ CallBootService (
Argument4 = (UINTN)AllocatePool (Arguments[2]); Argument4 = (UINTN)AllocatePool (Arguments[2]);
if ((VOID *)Argument4 == NULL) { if ((VOID *)Argument4 == NULL) {
FreePool (Arguments); Status = EFI_OUT_OF_RESOURCES;
return EFI_OUT_OF_RESOURCES; break;
} }
AllowSupervisorAccessToUserMemory (); AllowSupervisorAccessToUserMemory ();
@ -845,9 +816,7 @@ CallBootService (
*(UINT32 *)Arguments[3] = (UINT32)Argument5; *(UINT32 *)Arguments[3] = (UINT32)Argument5;
ForbidSupervisorAccessToUserMemory (); ForbidSupervisorAccessToUserMemory ();
FreePool (Arguments); break;
return Status;
case SysCallGetVariable: case SysCallGetVariable:
// //
// Argument 1: CHAR16 *VariableName // Argument 1: CHAR16 *VariableName
@ -876,16 +845,15 @@ CallBootService (
Argument6 = (UINTN)AllocateCopyPool (StrSize ((CHAR16 *)Arguments[1]), (CHAR16 *)Arguments[1]); Argument6 = (UINTN)AllocateCopyPool (StrSize ((CHAR16 *)Arguments[1]), (CHAR16 *)Arguments[1]);
if ((VOID *)Argument6 == NULL) { if ((VOID *)Argument6 == NULL) {
ForbidSupervisorAccessToUserMemory (); ForbidSupervisorAccessToUserMemory ();
FreePool (Arguments); Status = EFI_OUT_OF_RESOURCES;
return EFI_OUT_OF_RESOURCES; break;
} }
Status = FindGuid ((EFI_GUID *)Arguments[2], &CoreProtocol, &MemoryCoreSize); Status = FindGuid ((EFI_GUID *)Arguments[2], &CoreProtocol, &MemoryCoreSize);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
ForbidSupervisorAccessToUserMemory (); ForbidSupervisorAccessToUserMemory ();
FreePool ((VOID *)Argument6); FreePool ((VOID *)Argument6);
FreePool (Arguments); break;
return Status;
} }
gCpu->GetMemoryAttributes (gCpu, (EFI_PHYSICAL_ADDRESS)Arguments[4], &Attributes); gCpu->GetMemoryAttributes (gCpu, (EFI_PHYSICAL_ADDRESS)Arguments[4], &Attributes);
@ -905,8 +873,8 @@ CallBootService (
if ((VOID *)Argument5 == NULL) { if ((VOID *)Argument5 == NULL) {
ForbidSupervisorAccessToUserMemory (); ForbidSupervisorAccessToUserMemory ();
FreePool ((VOID *)Argument6); FreePool ((VOID *)Argument6);
FreePool (Arguments); Status = EFI_OUT_OF_RESOURCES;
return EFI_OUT_OF_RESOURCES; break;
} }
} }
ForbidSupervisorAccessToUserMemory (); ForbidSupervisorAccessToUserMemory ();
@ -937,9 +905,7 @@ CallBootService (
FreePool ((VOID *)Argument5); FreePool ((VOID *)Argument5);
} }
FreePool (Arguments); break;
return Status;
case SysCallBlockIoReset: case SysCallBlockIoReset:
// //
// Argument 1: EFI_BLOCK_IO_PROTOCOL *This // Argument 1: EFI_BLOCK_IO_PROTOCOL *This
@ -948,8 +914,8 @@ CallBootService (
BlockIo = FindInterface (FALSE, (VOID *)Arguments[1]); BlockIo = FindInterface (FALSE, (VOID *)Arguments[1]);
if (BlockIo == NULL) { if (BlockIo == NULL) {
FreePool (Arguments); Status = EFI_NOT_FOUND;
return EFI_NOT_FOUND; break;
} }
Status = BlockIo->Reset ( Status = BlockIo->Reset (
@ -957,9 +923,7 @@ CallBootService (
(BOOLEAN)Arguments[2] (BOOLEAN)Arguments[2]
); );
FreePool (Arguments); break;
return Status;
case SysCallBlockIoRead: case SysCallBlockIoRead:
// //
// Argument 1: EFI_BLOCK_IO_PROTOCOL *This // Argument 1: EFI_BLOCK_IO_PROTOCOL *This
@ -973,14 +937,14 @@ CallBootService (
BlockIo = FindInterface (FALSE, (VOID *)Arguments[1]); BlockIo = FindInterface (FALSE, (VOID *)Arguments[1]);
if (BlockIo == NULL) { if (BlockIo == NULL) {
FreePool (Arguments); Status = EFI_NOT_FOUND;
return EFI_NOT_FOUND; break;
} }
Argument5 = (UINTN)AllocatePool (Arguments[3]); Argument5 = (UINTN)AllocatePool (Arguments[3]);
if ((VOID *)Argument5 == NULL) { if ((VOID *)Argument5 == NULL) {
FreePool (Arguments); Status = EFI_OUT_OF_RESOURCES;
return EFI_OUT_OF_RESOURCES; break;
} }
Status = BlockIo->ReadBlocks ( Status = BlockIo->ReadBlocks (
@ -1002,9 +966,7 @@ CallBootService (
FreePool ((VOID *)Argument5); FreePool ((VOID *)Argument5);
FreePool (Arguments); break;
return Status;
case SysCallBlockIoWrite: case SysCallBlockIoWrite:
// //
// Argument 1: EFI_BLOCK_IO_PROTOCOL *This // Argument 1: EFI_BLOCK_IO_PROTOCOL *This
@ -1018,14 +980,14 @@ CallBootService (
BlockIo = FindInterface (FALSE, (VOID *)Arguments[1]); BlockIo = FindInterface (FALSE, (VOID *)Arguments[1]);
if (BlockIo == NULL) { if (BlockIo == NULL) {
FreePool (Arguments); Status = EFI_NOT_FOUND;
return EFI_NOT_FOUND; break;
} }
Argument5 = (UINTN)AllocatePool (Arguments[3]); Argument5 = (UINTN)AllocatePool (Arguments[3]);
if ((VOID *)Argument5 == NULL) { if ((VOID *)Argument5 == NULL) {
FreePool (Arguments); Status = EFI_OUT_OF_RESOURCES;
return EFI_OUT_OF_RESOURCES; break;
} }
gCpu->GetMemoryAttributes (gCpu, (EFI_PHYSICAL_ADDRESS)Arguments[4], &Attributes); gCpu->GetMemoryAttributes (gCpu, (EFI_PHYSICAL_ADDRESS)Arguments[4], &Attributes);
@ -1047,9 +1009,7 @@ CallBootService (
FreePool ((VOID *)Argument5); FreePool ((VOID *)Argument5);
FreePool (Arguments); break;
return Status;
case SysCallBlockIoFlush: case SysCallBlockIoFlush:
// //
// Argument 1: EFI_BLOCK_IO_PROTOCOL *This // Argument 1: EFI_BLOCK_IO_PROTOCOL *This
@ -1057,15 +1017,13 @@ CallBootService (
BlockIo = FindInterface (FALSE, (VOID *)Arguments[1]); BlockIo = FindInterface (FALSE, (VOID *)Arguments[1]);
if (BlockIo == NULL) { if (BlockIo == NULL) {
FreePool (Arguments); Status = EFI_NOT_FOUND;
return EFI_NOT_FOUND; break;
} }
Status = BlockIo->FlushBlocks (BlockIo); Status = BlockIo->FlushBlocks (BlockIo);
FreePool (Arguments); break;
return Status;
case SysCallDiskIoRead: case SysCallDiskIoRead:
// //
// Argument 1: EFI_DISK_IO_PROTOCOL *This // Argument 1: EFI_DISK_IO_PROTOCOL *This
@ -1079,14 +1037,14 @@ CallBootService (
DiskIo = FindInterface (FALSE, (VOID *)Arguments[1]); DiskIo = FindInterface (FALSE, (VOID *)Arguments[1]);
if (DiskIo == NULL) { if (DiskIo == NULL) {
FreePool (Arguments); Status = EFI_NOT_FOUND;
return EFI_NOT_FOUND; break;
} }
Argument5 = (UINTN)AllocatePool (Arguments[3]); Argument5 = (UINTN)AllocatePool (Arguments[3]);
if ((VOID *)Argument5 == NULL) { if ((VOID *)Argument5 == NULL) {
FreePool (Arguments); Status = EFI_OUT_OF_RESOURCES;
return EFI_OUT_OF_RESOURCES; break;
} }
Status = DiskIo->ReadDisk ( Status = DiskIo->ReadDisk (
@ -1108,9 +1066,7 @@ CallBootService (
FreePool ((VOID *)Argument5); FreePool ((VOID *)Argument5);
FreePool (Arguments); break;
return Status;
case SysCallDiskIoWrite: case SysCallDiskIoWrite:
// //
// Argument 1: EFI_DISK_IO_PROTOCOL *This // Argument 1: EFI_DISK_IO_PROTOCOL *This
@ -1124,14 +1080,14 @@ CallBootService (
DiskIo = FindInterface (FALSE, (VOID *)Arguments[1]); DiskIo = FindInterface (FALSE, (VOID *)Arguments[1]);
if (DiskIo == NULL) { if (DiskIo == NULL) {
FreePool (Arguments); Status = EFI_NOT_FOUND;
return EFI_NOT_FOUND; break;
} }
Argument5 = (UINTN)AllocatePool (Arguments[3]); Argument5 = (UINTN)AllocatePool (Arguments[3]);
if ((VOID *)Argument5 == NULL) { if ((VOID *)Argument5 == NULL) {
FreePool (Arguments); Status = EFI_OUT_OF_RESOURCES;
return EFI_OUT_OF_RESOURCES; break;
} }
gCpu->GetMemoryAttributes (gCpu, (EFI_PHYSICAL_ADDRESS)Arguments[4], &Attributes); gCpu->GetMemoryAttributes (gCpu, (EFI_PHYSICAL_ADDRESS)Arguments[4], &Attributes);
@ -1153,9 +1109,7 @@ CallBootService (
FreePool ((VOID *)Argument5); FreePool ((VOID *)Argument5);
FreePool (Arguments); break;
return Status;
case SysCallUnicodeStriColl: case SysCallUnicodeStriColl:
// //
// Argument 1: EFI_UNICODE_COLLATION_PROTOCOL *This // Argument 1: EFI_UNICODE_COLLATION_PROTOCOL *This
@ -1165,8 +1119,8 @@ CallBootService (
Unicode = FindInterface (FALSE, (VOID *)Arguments[1]); Unicode = FindInterface (FALSE, (VOID *)Arguments[1]);
if (Unicode == NULL) { if (Unicode == NULL) {
FreePool (Arguments); Status = EFI_NOT_FOUND;
return EFI_NOT_FOUND; break;
} }
if ((CHAR16 *)Arguments[2] != NULL) { if ((CHAR16 *)Arguments[2] != NULL) {
@ -1180,8 +1134,8 @@ CallBootService (
Argument4 = (UINTN)AllocateCopyPool (StrSize ((CHAR16 *)Arguments[2]), (CHAR16 *)Arguments[2]); Argument4 = (UINTN)AllocateCopyPool (StrSize ((CHAR16 *)Arguments[2]), (CHAR16 *)Arguments[2]);
ForbidSupervisorAccessToUserMemory (); ForbidSupervisorAccessToUserMemory ();
if ((VOID *)Argument4 == NULL) { if ((VOID *)Argument4 == NULL) {
FreePool (Arguments); Status = EFI_OUT_OF_RESOURCES;
return EFI_OUT_OF_RESOURCES; break;
} }
} }
@ -1200,8 +1154,8 @@ CallBootService (
FreePool ((VOID *)Argument4); FreePool ((VOID *)Argument4);
} }
FreePool (Arguments); Status = EFI_OUT_OF_RESOURCES;
return EFI_OUT_OF_RESOURCES; break;
} }
} }
@ -1219,9 +1173,7 @@ CallBootService (
FreePool ((VOID *)Argument5); FreePool ((VOID *)Argument5);
} }
FreePool (Arguments); break;
return Status;
case SysCallUnicodeMetaiMatch: case SysCallUnicodeMetaiMatch:
// //
// Argument 1: EFI_UNICODE_COLLATION_PROTOCOL *This // Argument 1: EFI_UNICODE_COLLATION_PROTOCOL *This
@ -1231,8 +1183,8 @@ CallBootService (
Unicode = FindInterface (FALSE, (VOID *)Arguments[1]); Unicode = FindInterface (FALSE, (VOID *)Arguments[1]);
if (Unicode == NULL) { if (Unicode == NULL) {
FreePool (Arguments); Status = EFI_NOT_FOUND;
return EFI_NOT_FOUND; break;
} }
if ((CHAR16 *)Arguments[2] != NULL) { if ((CHAR16 *)Arguments[2] != NULL) {
@ -1246,8 +1198,8 @@ CallBootService (
Argument4 = (UINTN)AllocateCopyPool (StrSize ((CHAR16 *)Arguments[2]), (CHAR16 *)Arguments[2]); Argument4 = (UINTN)AllocateCopyPool (StrSize ((CHAR16 *)Arguments[2]), (CHAR16 *)Arguments[2]);
ForbidSupervisorAccessToUserMemory (); ForbidSupervisorAccessToUserMemory ();
if ((VOID *)Argument4 == NULL) { if ((VOID *)Argument4 == NULL) {
FreePool (Arguments); Status = EFI_OUT_OF_RESOURCES;
return EFI_OUT_OF_RESOURCES; break;
} }
} }
@ -1266,8 +1218,8 @@ CallBootService (
FreePool ((VOID *)Argument4); FreePool ((VOID *)Argument4);
} }
FreePool (Arguments); Status = EFI_OUT_OF_RESOURCES;
return EFI_OUT_OF_RESOURCES; break;
} }
} }
@ -1285,9 +1237,7 @@ CallBootService (
FreePool ((VOID *)Argument5); FreePool ((VOID *)Argument5);
} }
FreePool (Arguments); break;
return Status;
case SysCallUnicodeStrLwr: case SysCallUnicodeStrLwr:
// //
// Argument 1: EFI_UNICODE_COLLATION_PROTOCOL *This // Argument 1: EFI_UNICODE_COLLATION_PROTOCOL *This
@ -1296,8 +1246,8 @@ CallBootService (
Unicode = FindInterface (FALSE, (VOID *)Arguments[1]); Unicode = FindInterface (FALSE, (VOID *)Arguments[1]);
if (Unicode == NULL) { if (Unicode == NULL) {
FreePool (Arguments); Status = EFI_NOT_FOUND;
return EFI_NOT_FOUND; break;
} }
if ((CHAR16 *)Arguments[2] != NULL) { if ((CHAR16 *)Arguments[2] != NULL) {
@ -1311,8 +1261,8 @@ CallBootService (
Argument4 = (UINTN)AllocateCopyPool (StrSize ((CHAR16 *)Arguments[2]), (CHAR16 *)Arguments[2]); Argument4 = (UINTN)AllocateCopyPool (StrSize ((CHAR16 *)Arguments[2]), (CHAR16 *)Arguments[2]);
ForbidSupervisorAccessToUserMemory (); ForbidSupervisorAccessToUserMemory ();
if ((VOID *)Argument4 == NULL) { if ((VOID *)Argument4 == NULL) {
FreePool (Arguments); Status = EFI_OUT_OF_RESOURCES;
return EFI_OUT_OF_RESOURCES; break;
} }
} }
@ -1329,9 +1279,8 @@ CallBootService (
FreePool ((VOID *)Argument4); FreePool ((VOID *)Argument4);
} }
FreePool (Arguments); Status = EFI_SUCCESS;
return EFI_SUCCESS; break;
case SysCallUnicodeStrUpr: case SysCallUnicodeStrUpr:
// //
// Argument 1: EFI_UNICODE_COLLATION_PROTOCOL *This // Argument 1: EFI_UNICODE_COLLATION_PROTOCOL *This
@ -1340,8 +1289,8 @@ CallBootService (
Unicode = FindInterface (FALSE, (VOID *)Arguments[1]); Unicode = FindInterface (FALSE, (VOID *)Arguments[1]);
if (Unicode == NULL) { if (Unicode == NULL) {
FreePool (Arguments); Status = EFI_NOT_FOUND;
return EFI_NOT_FOUND; break;
} }
if ((CHAR16 *)Arguments[2] != NULL) { if ((CHAR16 *)Arguments[2] != NULL) {
@ -1355,8 +1304,8 @@ CallBootService (
Argument4 = (UINTN)AllocateCopyPool (StrSize ((CHAR16 *)Arguments[2]), (CHAR16 *)Arguments[2]); Argument4 = (UINTN)AllocateCopyPool (StrSize ((CHAR16 *)Arguments[2]), (CHAR16 *)Arguments[2]);
ForbidSupervisorAccessToUserMemory (); ForbidSupervisorAccessToUserMemory ();
if ((VOID *)Argument4 == NULL) { if ((VOID *)Argument4 == NULL) {
FreePool (Arguments); Status = EFI_OUT_OF_RESOURCES;
return EFI_OUT_OF_RESOURCES; break;
} }
} }
@ -1373,9 +1322,8 @@ CallBootService (
FreePool ((VOID *)Argument4); FreePool ((VOID *)Argument4);
} }
FreePool (Arguments); Status = EFI_SUCCESS;
return EFI_SUCCESS; break;
case SysCallUnicodeFatToStr: case SysCallUnicodeFatToStr:
// //
// Argument 1: EFI_UNICODE_COLLATION_PROTOCOL *This // Argument 1: EFI_UNICODE_COLLATION_PROTOCOL *This
@ -1386,8 +1334,8 @@ CallBootService (
Unicode = FindInterface (FALSE, (VOID *)Arguments[1]); Unicode = FindInterface (FALSE, (VOID *)Arguments[1]);
if (Unicode == NULL) { if (Unicode == NULL) {
FreePool (Arguments); Status = EFI_NOT_FOUND;
return EFI_NOT_FOUND; break;
} }
if ((CHAR8 *)Arguments[3] != NULL) { if ((CHAR8 *)Arguments[3] != NULL) {
@ -1400,8 +1348,8 @@ CallBootService (
Argument4 = (UINTN)AllocateCopyPool (Arguments[2], (CHAR8 *)Arguments[3]); Argument4 = (UINTN)AllocateCopyPool (Arguments[2], (CHAR8 *)Arguments[3]);
ForbidSupervisorAccessToUserMemory (); ForbidSupervisorAccessToUserMemory ();
if ((VOID *)Argument4 == NULL) { if ((VOID *)Argument4 == NULL) {
FreePool (Arguments); Status = EFI_OUT_OF_RESOURCES;
return EFI_OUT_OF_RESOURCES; break;
} }
} }
@ -1417,8 +1365,8 @@ CallBootService (
FreePool ((VOID *)Argument4); FreePool ((VOID *)Argument4);
} }
FreePool (Arguments); Status = EFI_OUT_OF_RESOURCES;
return EFI_OUT_OF_RESOURCES; break;
} }
} }
@ -1441,9 +1389,8 @@ CallBootService (
FreePool ((VOID *)Argument5); FreePool ((VOID *)Argument5);
} }
FreePool (Arguments); Status = EFI_SUCCESS;
return EFI_SUCCESS; break;
case SysCallUnicodeStrToFat: case SysCallUnicodeStrToFat:
// //
// Argument 1: EFI_UNICODE_COLLATION_PROTOCOL *This // Argument 1: EFI_UNICODE_COLLATION_PROTOCOL *This
@ -1454,8 +1401,8 @@ CallBootService (
Unicode = FindInterface (FALSE, (VOID *)Arguments[1]); Unicode = FindInterface (FALSE, (VOID *)Arguments[1]);
if (Unicode == NULL) { if (Unicode == NULL) {
FreePool (Arguments); Status = EFI_NOT_FOUND;
return EFI_NOT_FOUND; break;
} }
if ((CHAR16 *)Arguments[2] != NULL) { if ((CHAR16 *)Arguments[2] != NULL) {
@ -1469,8 +1416,8 @@ CallBootService (
Argument4 = (UINTN)AllocateCopyPool (StrSize ((CHAR16 *)Arguments[2]), (CHAR16 *)Arguments[2]); Argument4 = (UINTN)AllocateCopyPool (StrSize ((CHAR16 *)Arguments[2]), (CHAR16 *)Arguments[2]);
ForbidSupervisorAccessToUserMemory (); ForbidSupervisorAccessToUserMemory ();
if ((VOID *)Argument4 == NULL) { if ((VOID *)Argument4 == NULL) {
FreePool (Arguments); Status = EFI_OUT_OF_RESOURCES;
return EFI_OUT_OF_RESOURCES; break;
} }
} }
@ -1486,8 +1433,8 @@ CallBootService (
FreePool ((VOID *)Argument4); FreePool ((VOID *)Argument4);
} }
FreePool (Arguments); Status = EFI_OUT_OF_RESOURCES;
return EFI_OUT_OF_RESOURCES; break;
} }
} }
@ -1510,14 +1457,13 @@ CallBootService (
FreePool ((VOID *)Argument5); FreePool ((VOID *)Argument5);
} }
FreePool (Arguments); break;
return Status;
default: default:
DEBUG ((DEBUG_ERROR, "Ring0: Unknown syscall type.\n")); DEBUG ((DEBUG_ERROR, "Ring0: Unknown syscall type.\n"));
Status = EFI_UNSUPPORTED;
break; break;
} }
FreePool (Arguments); FreePool (Arguments);
return EFI_UNSUPPORTED; return Status;
} }

2
MdeModulePkg/Core/Dxe/SysCall/IA32/CoreBootServices.nasm
View File

@ -53,7 +53,7 @@ ASM_PFX(ForbidSupervisorAccessToUserMemory):
; CallInstallMultipleProtocolInterfaces ( ; CallInstallMultipleProtocolInterfaces (
; IN EFI_HANDLE *Handle, ; IN EFI_HANDLE *Handle,
; IN VOID **ArgList, ; IN VOID **ArgList,
; IN UINT32 ArgListSize, ; IN UINTN ArgListSize,
; IN VOID *Function ; IN VOID *Function
; ); ; );
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------

66
MdeModulePkg/Core/Dxe/SysCall/SupportedProtocols.c
View File

@ -19,30 +19,6 @@ CallRing3 (
IN UINTN UserStackTop IN UINTN UserStackTop
); );
STATIC
UINTN
EFIAPI
AllocateStack (
IN UINTN Size,
OUT UINTN *Base
)
{
UINTN TopOfStack;
ASSERT (Base != NULL);
ASSERT (IS_ALIGNED (Size, EFI_PAGE_SIZE));
*Base = (UINTN)AllocatePages (EFI_SIZE_TO_PAGES (Size));
ASSERT (*Base != 0);
//
// Compute the top of the allocated stack. Pre-allocate a UINTN for safety.
//
TopOfStack = *Base + Size - CPU_STACK_ALIGNMENT;
TopOfStack = ALIGN_VALUE (TopOfStack, CPU_STACK_ALIGNMENT);
return TopOfStack;
}
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
GoToRing3 ( GoToRing3 (
@ -63,8 +39,12 @@ GoToRing3 (
return EFI_OUT_OF_RESOURCES; return EFI_OUT_OF_RESOURCES;
} }
UserStackTop = AllocateStack (STACK_SIZE, &UserStackBase); UserStackBase = (UINTN)AllocatePages (EFI_SIZE_TO_PAGES (STACK_SIZE));
UserStackTop -= ALIGN_VALUE (sizeof (RING3_CALL_DATA) + Number * sizeof (UINTN), CPU_STACK_ALIGNMENT); if (UserStackBase == 0) {
return EFI_OUT_OF_RESOURCES;
}
UserStackTop = UserStackBase + STACK_SIZE - (sizeof (RING3_CALL_DATA) + Number * sizeof (UINTN));
Input = (RING3_CALL_DATA *)UserStackTop; Input = (RING3_CALL_DATA *)UserStackTop;
@ -91,7 +71,7 @@ GoToRing3 (
// //
// Reserve space on stack for 4 arguments (X64 NOOPT prerequisite). // Reserve space on stack for 4 arguments (X64 NOOPT prerequisite).
// //
UserStackTop -= ALIGN_VALUE (8*4, CPU_STACK_ALIGNMENT); UserStackTop = ALIGN_VALUE (UserStackTop - 8*4 - CPU_STACK_ALIGNMENT, CPU_STACK_ALIGNMENT);
Status = CallRing3 ( Status = CallRing3 (
Input, Input,
@ -784,10 +764,18 @@ CoreFileOpen (
return EFI_OUT_OF_RESOURCES; return EFI_OUT_OF_RESOURCES;
} }
NewDriver = AllocatePool (sizeof (USER_SPACE_DRIVER)); NewDriver = AllocatePool (sizeof (USER_SPACE_DRIVER));
NewDriver->CoreWrapper = NewFile; if (NewDriver == NULL) {
NewDriver->UserPageTable = UserDriver->UserPageTable; *NewHandle = NULL;
NewDriver->NumberOfCalls = 0; FreePool (NewFile);
CoreFreePages (Ring3Pages, PagesNumber);
gUserPageTable = OldPageTable;
return EFI_OUT_OF_RESOURCES;
}
NewDriver->CoreWrapper = NewFile;
NewDriver->UserPageTable = UserDriver->UserPageTable;
NewDriver->NumberOfCalls = 0;
AllowSupervisorAccessToUserMemory (); AllowSupervisorAccessToUserMemory ();
NewDriver->UserSpaceDriver = *Ring3NewHandle; NewDriver->UserSpaceDriver = *Ring3NewHandle;
@ -885,10 +873,18 @@ CoreSimpleFileSystemOpenVolume (
return EFI_OUT_OF_RESOURCES; return EFI_OUT_OF_RESOURCES;
} }
NewDriver = AllocatePool (sizeof (USER_SPACE_DRIVER)); NewDriver = AllocatePool (sizeof (USER_SPACE_DRIVER));
NewDriver->CoreWrapper = File; if (NewDriver == NULL) {
NewDriver->UserPageTable = UserDriver->UserPageTable; *Root = NULL;
NewDriver->NumberOfCalls = 0; FreePool (File);
CoreFreePages (Physical, 1);
gUserPageTable = OldPageTable;
return EFI_OUT_OF_RESOURCES;
}
NewDriver->CoreWrapper = File;
NewDriver->UserPageTable = UserDriver->UserPageTable;
NewDriver->NumberOfCalls = 0;
AllowSupervisorAccessToUserMemory (); AllowSupervisorAccessToUserMemory ();
NewDriver->UserSpaceDriver = *Ring3Root; NewDriver->UserSpaceDriver = *Ring3Root;

2
MdeModulePkg/Core/Dxe/SysCall/X64/CoreBootServices.nasm
View File

@ -51,7 +51,7 @@ ASM_PFX(ForbidSupervisorAccessToUserMemory):
; CallInstallMultipleProtocolInterfaces ( ; CallInstallMultipleProtocolInterfaces (
; IN EFI_HANDLE *Handle, ; IN EFI_HANDLE *Handle,
; IN VOID **ArgList, ; IN VOID **ArgList,
; IN UINT32 ArgListSize, ; IN UINTN ArgListSize,
; IN VOID *Function ; IN VOID *Function
; ); ; );
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------