tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-04-08 17:05:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Ring3: Added UnicodeCollationProtocol wrappers.

Browse Source
This commit is contained in:
Mikhail Krichanov 2024-03-09 14:18:31 +03:00
parent a004745232
commit 83d58a276c
8 changed files with 658 additions and 9 deletions

1
MdeModulePkg/Core/Dxe/DxeMain.inf

@ -167,6 +167,7 @@
gEfiComponentNameProtocolGuid ## SOMETIMES_CONSUMES
gEfiDiskIoProtocolGuid ## SOMETIMES_CONSUMES
gEfiBlockIoProtocolGuid ## SOMETIMES_CONSUMES
gEfiUnicodeCollationProtocolGuid ## SOMETIMES_CONSUMES
# Arch Protocols
gEfiBdsArchProtocolGuid ## CONSUMES

1
MdeModulePkg/Core/Dxe/DxeRing3/DxeRing3.inf

@ -49,6 +49,7 @@
gEfiDiskIoProtocolGuid ## SOMETIMES_CONSUMES
gEfiBlockIoProtocolGuid ## SOMETIMES_CONSUMES
gEfiDevicePathProtocolGuid ## SOMETIMES_CONSUMES
gEfiUnicodeCollationProtocolGuid ## SOMETIMES_CONSUMES
[Depex]
TRUE

115
MdeModulePkg/Core/Dxe/DxeRing3/Ring3.h

@ -9,6 +9,7 @@
#include <Protocol/DevicePathUtilities.h>
#include <Protocol/DiskIo.h>
#include <Protocol/LoadedImage.h>
#include <Protocol/UnicodeCollation.h>
EFI_STATUS
EFIAPI
@ -1547,3 +1548,117 @@ Ring3QueryVariableInfo (
OUT UINT64 *RemainingVariableStorageSize,
OUT UINT64 *MaximumVariableSize
);
/**
Performs a case-insensitive comparison of two Null-terminated strings.
@param This A pointer to the EFI_UNICODE_COLLATION_PROTOCOL instance.
@param Str1 A pointer to a Null-terminated string.
@param Str2 A pointer to a Null-terminated string.
@retval 0 Str1 is equivalent to Str2.
@retval >0 Str1 is lexically greater than Str2.
@retval <0 Str1 is lexically less than Str2.
**/
INTN
EFIAPI
Ring3UnicodeStriColl (
IN EFI_UNICODE_COLLATION_PROTOCOL *This,
IN CHAR16 *Str1,
IN CHAR16 *Str2
);
/**
Performs a case-insensitive comparison of a Null-terminated
pattern string and a Null-terminated string.
@param This A pointer to the EFI_UNICODE_COLLATION_PROTOCOL instance.
@param String A pointer to a Null-terminated string.
@param Pattern A pointer to a Null-terminated pattern string.
@retval TRUE Pattern was found in String.
@retval FALSE Pattern was not found in String.
**/
BOOLEAN
EFIAPI
Ring3UnicodeMetaiMatch (
IN EFI_UNICODE_COLLATION_PROTOCOL *This,
IN CHAR16 *String,
IN CHAR16 *Pattern
);
/**
Converts all the characters in a Null-terminated string to
lower case characters.
@param This A pointer to the EFI_UNICODE_COLLATION_PROTOCOL instance.
@param String A pointer to a Null-terminated string.
**/
VOID
EFIAPI
Ring3UnicodeStrLwr (
IN EFI_UNICODE_COLLATION_PROTOCOL *This,
IN OUT CHAR16 *Str
);
/**
Converts all the characters in a Null-terminated string to upper
case characters.
@param This A pointer to the EFI_UNICODE_COLLATION_PROTOCOL instance.
@param String A pointer to a Null-terminated string.
**/
VOID
EFIAPI
Ring3UnicodeStrUpr (
IN EFI_UNICODE_COLLATION_PROTOCOL *This,
IN OUT CHAR16 *Str
);
/**
Converts an 8.3 FAT file name in an OEM character set to a Null-terminated
string.
@param This A pointer to the EFI_UNICODE_COLLATION_PROTOCOL instance.
@param FatSize The size of the string Fat in bytes.
@param Fat A pointer to a Null-terminated string that contains an 8.3 file
name using an 8-bit OEM character set.
@param String A pointer to a Null-terminated string. The string must
be allocated in advance to hold FatSize characters.
**/
VOID
EFIAPI
Ring3UnicodeFatToStr (
IN EFI_UNICODE_COLLATION_PROTOCOL *This,
IN UINTN FatSize,
IN CHAR8 *Fat,
OUT CHAR16 *String
);
/**
Converts a Null-terminated string to legal characters in a FAT
filename using an OEM character set.
@param This A pointer to the EFI_UNICODE_COLLATION_PROTOCOL instance.
@param String A pointer to a Null-terminated string.
@param FatSize The size of the string Fat in bytes.
@param Fat A pointer to a string that contains the converted version of
String using legal FAT characters from an OEM character set.
@retval TRUE One or more conversions failed and were substituted with '_'
@retval FALSE None of the conversions failed.
**/
BOOLEAN
EFIAPI
Ring3UnicodeStrToFat (
IN EFI_UNICODE_COLLATION_PROTOCOL *This,
IN CHAR16 *String,
IN UINTN FatSize,
OUT CHAR8 *Fat
);

96
MdeModulePkg/Core/Dxe/DxeRing3/Ring3Protocols.c

@ -112,3 +112,99 @@ Ring3DiskIoWrite (
Buffer
);
}
INTN
EFIAPI
Ring3UnicodeStriColl (
IN EFI_UNICODE_COLLATION_PROTOCOL *This,
IN CHAR16 *Str1,
IN CHAR16 *Str2
)
{
return (INTN)SysCall (
SysCallUnicodeStriColl,
This,
Str1,
Str2
);
}
BOOLEAN
EFIAPI
Ring3UnicodeMetaiMatch (
IN EFI_UNICODE_COLLATION_PROTOCOL *This,
IN CHAR16 *String,
IN CHAR16 *Pattern
)
{
return (BOOLEAN)SysCall (
SysCallUnicodeMetaiMatch,
This,
String,
Pattern
);
}
VOID
EFIAPI
Ring3UnicodeStrLwr (
IN EFI_UNICODE_COLLATION_PROTOCOL *This,
IN OUT CHAR16 *Str
)
{
SysCall (
SysCallUnicodeStrLwr,
This,
Str
);
}
VOID
EFIAPI
Ring3UnicodeStrUpr (
IN EFI_UNICODE_COLLATION_PROTOCOL *This,
IN OUT CHAR16 *Str
)
{
SysCall (
SysCallUnicodeStrUpr,
This,
Str
);
}
VOID
EFIAPI
Ring3UnicodeFatToStr (
IN EFI_UNICODE_COLLATION_PROTOCOL *This,
IN UINTN FatSize,
IN CHAR8 *Fat,
OUT CHAR16 *String
)
{
SysCall (
SysCallUnicodeFatToStr,
This,
FatSize,
Fat,
String
);
}
BOOLEAN
EFIAPI
Ring3UnicodeStrToFat (
IN EFI_UNICODE_COLLATION_PROTOCOL *This,
IN CHAR16 *String,
IN UINTN FatSize,
OUT CHAR8 *Fat
)
{
return (BOOLEAN)SysCall (
SysCallUnicodeStrToFat,
This,
String,
FatSize,
Fat
);
}

22
MdeModulePkg/Core/Dxe/DxeRing3/Ring3UefiBootServices.c

@ -29,6 +29,7 @@ FixInterface (
EFI_BLOCK_IO_PROTOCOL *BlockIo;
EFI_DISK_IO_PROTOCOL *DiskIo;
EFI_DEVICE_PATH_UTILITIES_PROTOCOL *DevicePath;
EFI_UNICODE_COLLATION_PROTOCOL *Unicode;
ASSERT (Protocol != NULL);
ASSERT (Interface != NULL);
@ -71,6 +72,16 @@ FixInterface (
DevicePath->IsDevicePathMultiInstance = NULL;
DevicePath->CreateDeviceNode = NULL;
} else if (CompareGuid (Protocol, &gEfiUnicodeCollationProtocolGuid)) {
Unicode = (EFI_UNICODE_COLLATION_PROTOCOL *)*Interface;
Unicode->StriColl = Ring3UnicodeStriColl;
Unicode->MetaiMatch = Ring3UnicodeMetaiMatch;
Unicode->StrLwr = Ring3UnicodeStrLwr;
Unicode->StrUpr = Ring3UnicodeStrUpr;
Unicode->FatToStr = Ring3UnicodeFatToStr;
Unicode->StrToFat = Ring3UnicodeStrToFat;
} else {
return EFI_UNSUPPORTED;
}
@ -568,9 +579,14 @@ Ring3LocateHandleBuffer (
OUT EFI_HANDLE **Buffer
)
{
DEBUG ((DEBUG_ERROR, "Ring3: LocateHandleBuffer is not supported\n"));
return EFI_UNSUPPORTED;
return SysCall (
SysCallLocateHandleBuffer,
SearchType,
Protocol,
SearchKey,
NumberHandles,
Buffer
);
}
EFI_STATUS

424
MdeModulePkg/Core/Dxe/SysCall/BootServices.c

@ -8,9 +8,11 @@
#include "DxeMain.h"
#include "SupportedProtocols.h"
EFI_DISK_IO_PROTOCOL *mCoreDiskIoProtocol;
EFI_BLOCK_IO_PROTOCOL *mCoreBlockIoProtocol;
UINTN mRing3InterfacePointer = 0;
EFI_DISK_IO_PROTOCOL *mCoreDiskIoProtocol;
EFI_BLOCK_IO_PROTOCOL *mCoreBlockIoProtocol;
EFI_UNICODE_COLLATION_PROTOCOL *mCoreUnicodeCollationProtocol;
UINTN mRing3InterfacePointer = 0;
EFI_STATUS
EFIAPI
@ -78,6 +80,11 @@ FindGuid (
*Core = &gEfiSimpleFileSystemProtocolGuid;
*CoreSize = sizeof (EFI_SIMPLE_FILE_SYSTEM_PROTOCOL);
} else if (CompareGuid (Ring3, &gEfiUnicodeCollationProtocolGuid)) {
*Core = &gEfiUnicodeCollationProtocolGuid;
*CoreSize = sizeof (EFI_UNICODE_COLLATION_PROTOCOL);
} else {
DEBUG ((DEBUG_ERROR, "Ring0: Unknown protocol - %g.\n", Ring3));
return EFI_NOT_FOUND;
@ -95,9 +102,11 @@ PrepareRing3Interface (
IN UINT32 CoreSize
)
{
UINTN Ring3Limit;
VOID *Ring3Interface;
EFI_BLOCK_IO_PROTOCOL *BlockIo;
EFI_STATUS Status;
UINTN Ring3Limit;
VOID *Ring3Interface;
EFI_BLOCK_IO_PROTOCOL *BlockIo;
EFI_UNICODE_COLLATION_PROTOCOL *Unicode;
ASSERT (Guid != NULL);
ASSERT (CoreInterface != NULL);
@ -130,6 +139,25 @@ PrepareRing3Interface (
BlockIo->Media = (EFI_BLOCK_IO_MEDIA *)mRing3InterfacePointer;
mRing3InterfacePointer += sizeof (EFI_BLOCK_IO_MEDIA);
} else if (CompareGuid (Guid, &gEfiUnicodeCollationProtocolGuid)) {
mCoreUnicodeCollationProtocol = (EFI_UNICODE_COLLATION_PROTOCOL *)CoreInterface;
Unicode = (EFI_UNICODE_COLLATION_PROTOCOL *)Ring3Interface;
ASSERT ((mRing3InterfacePointer + AsciiStrSize (Unicode->SupportedLanguages)) <= Ring3Limit);
Status = AsciiStrCpyS (
(CHAR8 *)mRing3InterfacePointer,
AsciiStrSize (Unicode->SupportedLanguages),
Unicode->SupportedLanguages
);
if (EFI_ERROR (Status)) {
return NULL;
}
Unicode->SupportedLanguages = (CHAR8 *)mRing3InterfacePointer;
mRing3InterfacePointer += AsciiStrSize (Unicode->SupportedLanguages);
}
return Ring3Interface;
@ -164,6 +192,7 @@ CallBootService (
)
{
EFI_STATUS Status;
EFI_STATUS StatusBS;
UINT64 Attributes;
VOID *Interface;
EFI_GUID *CoreProtocol;
@ -175,9 +204,15 @@ CallBootService (
VOID **UserArgList;
VOID *CoreArgList[MAX_LIST];
EFI_HANDLE CoreHandle;
VOID *Ring3Pages;
UINT32 PagesNumber;
EFI_DRIVER_BINDING_PROTOCOL *CoreDriverBinding;
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *CoreSimpleFileSystem;
Argument4 = 0;
Argument5 = 0;
Argument6 = 0;
//
// Check User variables.
//
@ -494,6 +529,77 @@ CallBootService (
return EFI_SUCCESS;
case SysCallLocateHandleBuffer:
//
// Argument 1: EFI_LOCATE_SEARCH_TYPE SearchType
// Argument 2: EFI_GUID *Protocol OPTIONAL
// Argument 3: VOID *SearchKey OPTIONAL,
// Argument 4: UINTN *NumberHandles,
// Argument 5: EFI_HANDLE **Buffer
//
if ((EFI_GUID *)CoreRbp->Argument2 != NULL) {
gCpu->GetMemoryAttributes (gCpu, (EFI_PHYSICAL_ADDRESS)CoreRbp->Argument2, &Attributes);
ASSERT ((Attributes & EFI_MEMORY_USER) != 0);
gCpu->GetMemoryAttributes (gCpu, (EFI_PHYSICAL_ADDRESS)(CoreRbp->Argument2 + sizeof (EFI_GUID) - 1), &Attributes);
ASSERT ((Attributes & EFI_MEMORY_USER) != 0);
DisableSMAP ();
Status = FindGuid ((EFI_GUID *)CoreRbp->Argument2, &CoreProtocol, &MemoryCoreSize);
EnableSMAP ();
if (EFI_ERROR (Status)) {
return Status;
}
}
StatusBS = gBS->LocateHandleBuffer (
(EFI_LOCATE_SEARCH_TYPE)CoreRbp->Argument1,
CoreProtocol,
(VOID *)CoreRbp->Argument3,
&Argument4,
(EFI_HANDLE **)&Argument5
);
gCpu->GetMemoryAttributes (gCpu, (EFI_PHYSICAL_ADDRESS)((UINTN)UserRsp + 7 * sizeof (UINTN) - 1), &Attributes);
ASSERT ((Attributes & EFI_MEMORY_USER) != 0);
DisableSMAP ();
if ((UINTN *)UserRsp->Arguments[4] != NULL) {
gCpu->GetMemoryAttributes (gCpu, (EFI_PHYSICAL_ADDRESS)UserRsp->Arguments[4], &Attributes);
ASSERT ((Attributes & EFI_MEMORY_USER) != 0);
gCpu->GetMemoryAttributes (gCpu, (EFI_PHYSICAL_ADDRESS)(UserRsp->Arguments[4] + sizeof (UINTN) - 1), &Attributes);
ASSERT ((Attributes & EFI_MEMORY_USER) != 0);
*(UINTN *)UserRsp->Arguments[4] = Argument4;
}
if ((UINTN *)UserRsp->Arguments[5] != NULL) {
gCpu->GetMemoryAttributes (gCpu, (EFI_PHYSICAL_ADDRESS)UserRsp->Arguments[5], &Attributes);
ASSERT ((Attributes & EFI_MEMORY_USER) != 0);
gCpu->GetMemoryAttributes (gCpu, (EFI_PHYSICAL_ADDRESS)(UserRsp->Arguments[5] + sizeof (EFI_HANDLE *) - 1), &Attributes);
ASSERT ((Attributes & EFI_MEMORY_USER) != 0);
PagesNumber = EFI_SIZE_TO_PAGES (Argument4 * sizeof (EFI_HANDLE *));
Status = CoreAllocatePages (
AllocateAnyPages,
EfiRing3MemoryType,
PagesNumber,
(EFI_PHYSICAL_ADDRESS *)&Ring3Pages
);
if (EFI_ERROR (Status)) {
return Status;
}
CopyMem (Ring3Pages, (VOID *)Argument5, Argument4 * sizeof (EFI_HANDLE *));
FreePool ((VOID *)Argument5);
*(EFI_HANDLE **)UserRsp->Arguments[5] = (EFI_HANDLE *)Ring3Pages;
}
EnableSMAP ();
return StatusBS;
case SysCallBlockIoReset:
//
// Argument 1: EFI_BLOCK_IO_PROTOCOL *This
@ -673,6 +779,312 @@ CallBootService (
FreePool ((VOID *)Argument5);
return Status;
case SysCallUnicodeStriColl:
//
// Argument 1: EFI_UNICODE_COLLATION_PROTOCOL *This
// Argument 2: CHAR16 *Str1
// Argument 3: CHAR16 *Str2
//
if ((CHAR16 *)CoreRbp->Argument2 != NULL) {
gCpu->GetMemoryAttributes (gCpu, (EFI_PHYSICAL_ADDRESS)CoreRbp->Argument2, &Attributes);
ASSERT ((Attributes & EFI_MEMORY_USER) != 0);
DisableSMAP ();
gCpu->GetMemoryAttributes (gCpu, (EFI_PHYSICAL_ADDRESS)(CoreRbp->Argument2 + StrSize ((CHAR16 *)CoreRbp->Argument2) - 1), &Attributes);
ASSERT ((Attributes & EFI_MEMORY_USER) != 0);
Argument4 = (UINTN)AllocateCopyPool (StrSize ((CHAR16 *)CoreRbp->Argument2), (CHAR16 *)CoreRbp->Argument2);
EnableSMAP ();
if ((VOID *)Argument4 == NULL) {
return EFI_OUT_OF_RESOURCES;
}
}
if ((CHAR16 *)CoreRbp->Argument3 != NULL) {
gCpu->GetMemoryAttributes (gCpu, (EFI_PHYSICAL_ADDRESS)CoreRbp->Argument3, &Attributes);
ASSERT ((Attributes & EFI_MEMORY_USER) != 0);
DisableSMAP ();
gCpu->GetMemoryAttributes (gCpu, (EFI_PHYSICAL_ADDRESS)(CoreRbp->Argument3 + StrSize ((CHAR16 *)CoreRbp->Argument3) - 1), &Attributes);
ASSERT ((Attributes & EFI_MEMORY_USER) != 0);
Argument5 = (UINTN)AllocateCopyPool (StrSize ((CHAR16 *)CoreRbp->Argument3), (CHAR16 *)CoreRbp->Argument3);
EnableSMAP ();
if ((VOID *)Argument5 == NULL) {
if ((VOID *)Argument4 != NULL) {
FreePool ((VOID *)Argument4);
}
return EFI_OUT_OF_RESOURCES;
}
}
Status = (EFI_STATUS)mCoreUnicodeCollationProtocol->StriColl (
mCoreUnicodeCollationProtocol,
(CHAR16 *)Argument4,
(CHAR16 *)Argument5
);
if ((VOID *)Argument4 != NULL) {
FreePool ((VOID *)Argument4);
}
if ((VOID *)Argument5 != NULL) {
FreePool ((VOID *)Argument5);
}
return Status;
case SysCallUnicodeMetaiMatch:
//
// Argument 1: EFI_UNICODE_COLLATION_PROTOCOL *This
// Argument 2: CHAR16 *String
// Argument 3: CHAR16 *Pattern
//
if ((CHAR16 *)CoreRbp->Argument2 != NULL) {
gCpu->GetMemoryAttributes (gCpu, (EFI_PHYSICAL_ADDRESS)CoreRbp->Argument2, &Attributes);
ASSERT ((Attributes & EFI_MEMORY_USER) != 0);
DisableSMAP ();
gCpu->GetMemoryAttributes (gCpu, (EFI_PHYSICAL_ADDRESS)(CoreRbp->Argument2 + StrSize ((CHAR16 *)CoreRbp->Argument2) - 1), &Attributes);
ASSERT ((Attributes & EFI_MEMORY_USER) != 0);
Argument4 = (UINTN)AllocateCopyPool (StrSize ((CHAR16 *)CoreRbp->Argument2), (CHAR16 *)CoreRbp->Argument2);
EnableSMAP ();
if ((VOID *)Argument4 == NULL) {
return EFI_OUT_OF_RESOURCES;
}
}
if ((CHAR16 *)CoreRbp->Argument3 != NULL) {
gCpu->GetMemoryAttributes (gCpu, (EFI_PHYSICAL_ADDRESS)CoreRbp->Argument3, &Attributes);
ASSERT ((Attributes & EFI_MEMORY_USER) != 0);
DisableSMAP ();
gCpu->GetMemoryAttributes (gCpu, (EFI_PHYSICAL_ADDRESS)(CoreRbp->Argument3 + StrSize ((CHAR16 *)CoreRbp->Argument3) - 1), &Attributes);
ASSERT ((Attributes & EFI_MEMORY_USER) != 0);
Argument5 = (UINTN)AllocateCopyPool (StrSize ((CHAR16 *)CoreRbp->Argument3), (CHAR16 *)CoreRbp->Argument3);
EnableSMAP ();
if ((VOID *)Argument5 == NULL) {
if ((VOID *)Argument4 != NULL) {
FreePool ((VOID *)Argument4);
}
return EFI_OUT_OF_RESOURCES;
}
}
Status = (EFI_STATUS)mCoreUnicodeCollationProtocol->MetaiMatch (
mCoreUnicodeCollationProtocol,
(CHAR16 *)Argument4,
(CHAR16 *)Argument5
);
if ((VOID *)Argument4 != NULL) {
FreePool ((VOID *)Argument4);
}
if ((VOID *)Argument5 != NULL) {
FreePool ((VOID *)Argument5);
}
return Status;
case SysCallUnicodeStrLwr:
//
// Argument 1: EFI_UNICODE_COLLATION_PROTOCOL *This
// Argument 2: CHAR16 *Str
//
if ((CHAR16 *)CoreRbp->Argument2 != NULL) {
gCpu->GetMemoryAttributes (gCpu, (EFI_PHYSICAL_ADDRESS)CoreRbp->Argument2, &Attributes);
ASSERT ((Attributes & EFI_MEMORY_USER) != 0);
DisableSMAP ();
gCpu->GetMemoryAttributes (gCpu, (EFI_PHYSICAL_ADDRESS)(CoreRbp->Argument2 + StrSize ((CHAR16 *)CoreRbp->Argument2) - 1), &Attributes);
ASSERT ((Attributes & EFI_MEMORY_USER) != 0);
Argument4 = (UINTN)AllocateCopyPool (StrSize ((CHAR16 *)CoreRbp->Argument2), (CHAR16 *)CoreRbp->Argument2);
EnableSMAP ();
if ((VOID *)Argument4 == NULL) {
return EFI_OUT_OF_RESOURCES;
}
}
mCoreUnicodeCollationProtocol->StrLwr (
mCoreUnicodeCollationProtocol,
(CHAR16 *)Argument4
);
if ((VOID *)Argument4 != NULL) {
DisableSMAP ();
Status = StrCpyS ((CHAR16 *)CoreRbp->Argument2, StrLen ((CHAR16 *)CoreRbp->Argument2) + 1, (CHAR16 *)Argument4);
EnableSMAP ();
FreePool ((VOID *)Argument4);
}
return Status;
case SysCallUnicodeStrUpr:
//
// Argument 1: EFI_UNICODE_COLLATION_PROTOCOL *This
// Argument 2: CHAR16 *Str
//
if ((CHAR16 *)CoreRbp->Argument2 != NULL) {
gCpu->GetMemoryAttributes (gCpu, (EFI_PHYSICAL_ADDRESS)CoreRbp->Argument2, &Attributes);
ASSERT ((Attributes & EFI_MEMORY_USER) != 0);
DisableSMAP ();
gCpu->GetMemoryAttributes (gCpu, (EFI_PHYSICAL_ADDRESS)(CoreRbp->Argument2 + StrSize ((CHAR16 *)CoreRbp->Argument2) - 1), &Attributes);
ASSERT ((Attributes & EFI_MEMORY_USER) != 0);
Argument4 = (UINTN)AllocateCopyPool (StrSize ((CHAR16 *)CoreRbp->Argument2), (CHAR16 *)CoreRbp->Argument2);
EnableSMAP ();
if ((VOID *)Argument4 == NULL) {
return EFI_OUT_OF_RESOURCES;
}
}
mCoreUnicodeCollationProtocol->StrUpr (
mCoreUnicodeCollationProtocol,
(CHAR16 *)Argument4
);
if ((VOID *)Argument4 != NULL) {
DisableSMAP ();
Status = StrCpyS ((CHAR16 *)CoreRbp->Argument2, StrLen ((CHAR16 *)CoreRbp->Argument2) + 1, (CHAR16 *)Argument4);
EnableSMAP ();
FreePool ((VOID *)Argument4);
}
return Status;
case SysCallUnicodeFatToStr:
//
// Argument 1: EFI_UNICODE_COLLATION_PROTOCOL *This
// Argument 2: UINTN FatSize
// Argument 3: CHAR8 *Fat
// Argument 4: CHAR16 *String
//
if ((CHAR8 *)CoreRbp->Argument3 != NULL) {
gCpu->GetMemoryAttributes (gCpu, (EFI_PHYSICAL_ADDRESS)CoreRbp->Argument3, &Attributes);
ASSERT ((Attributes & EFI_MEMORY_USER) != 0);
gCpu->GetMemoryAttributes (gCpu, (EFI_PHYSICAL_ADDRESS)(CoreRbp->Argument3 + CoreRbp->Argument2 - 1), &Attributes);
ASSERT ((Attributes & EFI_MEMORY_USER) != 0);
DisableSMAP ();
Argument4 = (UINTN)AllocateCopyPool (CoreRbp->Argument2, (CHAR8 *)CoreRbp->Argument3);
EnableSMAP ();
if ((VOID *)Argument4 == NULL) {
return EFI_OUT_OF_RESOURCES;
}
}
gCpu->GetMemoryAttributes (gCpu, (EFI_PHYSICAL_ADDRESS)((UINTN)UserRsp + 6 * sizeof (UINTN) - 1), &Attributes);
ASSERT ((Attributes & EFI_MEMORY_USER) != 0);
if ((CHAR16 *)UserRsp->Arguments[4] != NULL) {
gCpu->GetMemoryAttributes (gCpu, (EFI_PHYSICAL_ADDRESS)UserRsp->Arguments[4], &Attributes);
ASSERT ((Attributes & EFI_MEMORY_USER) != 0);
gCpu->GetMemoryAttributes (gCpu, (EFI_PHYSICAL_ADDRESS)(UserRsp->Arguments[4] + 2 * CoreRbp->Argument2 - 1), &Attributes);
ASSERT ((Attributes & EFI_MEMORY_USER) != 0);
Argument5 = (UINTN)AllocatePool (2 * CoreRbp->Argument2);
if ((VOID *)Argument5 == NULL) {
if ((VOID *)Argument4 != NULL) {
FreePool ((VOID *)Argument4);
}
return EFI_OUT_OF_RESOURCES;
}
}
mCoreUnicodeCollationProtocol->FatToStr (
mCoreUnicodeCollationProtocol,
CoreRbp->Argument2,
(CHAR8 *)Argument4,
(CHAR16 *)Argument5
);
if ((VOID *)Argument4 != NULL) {
FreePool ((VOID *)Argument4);
}
if ((VOID *)Argument5 != NULL) {
DisableSMAP ();
CopyMem ((VOID *)UserRsp->Arguments[4], (VOID *)Argument5, 2 * CoreRbp->Argument2);
EnableSMAP ();
FreePool ((VOID *)Argument5);
}
return EFI_SUCCESS;
case SysCallUnicodeStrToFat:
//
// Argument 1: EFI_UNICODE_COLLATION_PROTOCOL *This
// Argument 2: CHAR16 *String
// Argument 3: UINTN FatSize
// Argument 4: CHAR8 *Fat
//
if ((CHAR16 *)CoreRbp->Argument2 != NULL) {
gCpu->GetMemoryAttributes (gCpu, (EFI_PHYSICAL_ADDRESS)CoreRbp->Argument2, &Attributes);
ASSERT ((Attributes & EFI_MEMORY_USER) != 0);
DisableSMAP ();
gCpu->GetMemoryAttributes (gCpu, (EFI_PHYSICAL_ADDRESS)(CoreRbp->Argument2 + StrSize ((CHAR16 *)CoreRbp->Argument2) - 1), &Attributes);
ASSERT ((Attributes & EFI_MEMORY_USER) != 0);
Argument4 = (UINTN)AllocateCopyPool (StrSize ((CHAR16 *)CoreRbp->Argument2), (CHAR16 *)CoreRbp->Argument2);
EnableSMAP ();
if ((VOID *)Argument4 == NULL) {
return EFI_OUT_OF_RESOURCES;
}
}
gCpu->GetMemoryAttributes (gCpu, (EFI_PHYSICAL_ADDRESS)((UINTN)UserRsp + 6 * sizeof (UINTN) - 1), &Attributes);
ASSERT ((Attributes & EFI_MEMORY_USER) != 0);
if ((CHAR8 *)UserRsp->Arguments[4] != NULL) {
gCpu->GetMemoryAttributes (gCpu, (EFI_PHYSICAL_ADDRESS)UserRsp->Arguments[4], &Attributes);
ASSERT ((Attributes & EFI_MEMORY_USER) != 0);
gCpu->GetMemoryAttributes (gCpu, (EFI_PHYSICAL_ADDRESS)(UserRsp->Arguments[4] + CoreRbp->Argument3 - 1), &Attributes);
ASSERT ((Attributes & EFI_MEMORY_USER) != 0);
Argument5 = (UINTN)AllocatePool (CoreRbp->Argument3);
if ((VOID *)Argument5 == NULL) {
if ((VOID *)Argument4 != NULL) {
FreePool ((VOID *)Argument4);
}
return EFI_OUT_OF_RESOURCES;
}
}
mCoreUnicodeCollationProtocol->StrToFat (
mCoreUnicodeCollationProtocol,
(CHAR16 *)Argument4,
CoreRbp->Argument3,
(CHAR8 *)Argument5
);
if ((VOID *)Argument4 != NULL) {
FreePool ((VOID *)Argument4);
}
if ((VOID *)Argument5 != NULL) {
DisableSMAP ();
CopyMem ((VOID *)UserRsp->Arguments[4], (VOID *)Argument5, CoreRbp->Argument3);
EnableSMAP ();
FreePool ((VOID *)Argument5);
}
return EFI_SUCCESS;
default:
DEBUG ((DEBUG_ERROR, "Ring0: Unknown syscall type.\n"));
break;

1
MdeModulePkg/Core/Dxe/SysCall/SupportedProtocols.h

@ -9,6 +9,7 @@
#include <Protocol/ComponentName.h>
#include <Protocol/DevicePathUtilities.h>
#include <Protocol/DiskIo.h>
#include <Protocol/UnicodeCollation.h>
extern EFI_DRIVER_BINDING_PROTOCOL mRing3DriverBindingProtocol;
extern EFI_SIMPLE_FILE_SYSTEM_PROTOCOL mRing3SimpleFileSystemProtocol;

7
MdePkg/Include/Uefi/UefiSpec.h

@ -2027,6 +2027,7 @@ typedef enum {
SysCallFreePages,
SysCallRaiseTpl,
SysCallRestoreTpl,
SysCallLocateHandleBuffer,
//
// RuntimeServices
//
@ -2039,6 +2040,12 @@ typedef enum {
SysCallBlockIoFlush,
SysCallDiskIoRead,
SysCallDiskIoWrite,
SysCallUnicodeStriColl,
SysCallUnicodeMetaiMatch,
SysCallUnicodeStrLwr,
SysCallUnicodeStrUpr,
SysCallUnicodeFatToStr,
SysCallUnicodeStrToFat,
SysCallMax
} SYS_CALL_TYPE;