mika/nx-hbloader
1
0
Fork 0
mirror of https://github.com/switchbrew/nx-hbloader.git synced 2025-06-21 05:22:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revoke access to CodeMemory syscalls if they are not usable

Browse Source
This commit is contained in:
fincs 2020-08-04 14:10:31 +02:00
parent 7caa177353
commit 0ce48ebe22
No known key found for this signature in database
GPG Key ID: 62C7609ADA219C60
1 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
source/main.c
View File

@ -20,6 +20,7 @@ static bool g_isApplication = 0;
static NsApplicationControlData g_applicationControlData; static NsApplicationControlData g_applicationControlData;
static bool g_isAutomaticGameplayRecording = 0; static bool g_isAutomaticGameplayRecording = 0;
static bool g_smCloseWorkaround = false; static bool g_smCloseWorkaround = false;
static bool g_isCodeMemoryAvailable = false;
static u64 g_appletHeapSize = 0; static u64 g_appletHeapSize = 0;
static u64 g_appletHeapReservationSize = 0; static u64 g_appletHeapReservationSize = 0;
@ -248,6 +249,31 @@ static void getOwnProcessHandle(void)
threadClose(&t); threadClose(&t);
} }
static void getIsCodeMemoryAvailable(void)
{
Result rc;
u64 tmp = 0;
const bool is_5x = R_VALUE(svcGetInfo(&tmp, InfoType_UserExceptionContextAddress, INVALID_HANDLE, 0)) != KERNELRESULT(InvalidEnumValue);
if (is_5x) {
// On [5.0.0+], the kernel does not allow the creator process of a CodeMemory object
// to use svcControlCodeMemory on itself, thus returning InvalidMemoryState (0xD401).
// However the kernel could be patched or reimplemented to support same-process usage of CodeMemory.
// We can detect that by passing a bad operation and observe if we actually get InvalidEnumValue (0xF001).
Handle code;
rc = svcCreateCodeMemory(&code, g_heapAddr, 0x1000);
if (R_SUCCEEDED(rc)) {
rc = svcControlCodeMemory(code, (CodeMapOperation)-1, 0, 0x1000, 0);
g_isCodeMemoryAvailable = R_VALUE(rc) == KERNELRESULT(InvalidEnumValue);
svcCloseHandle(code);
}
} else {
// On [4.0.0-4.1.0] there is no such restriction on own-process CodeMemory usage.
const bool is_4x = R_VALUE(svcGetInfo(&tmp, InfoType_InitialProcessIdRange, INVALID_HANDLE, 0)) != KERNELRESULT(InvalidEnumValue);
g_isCodeMemoryAvailable = is_4x;
}
}
void loadNro(void) void loadNro(void)
{ {
NroHeader* header = NULL; NroHeader* header = NULL;
@ -416,12 +442,19 @@ void loadNro(void)
}; };
ConfigEntry *entry_AppletType = &entries[2]; ConfigEntry *entry_AppletType = &entries[2];
ConfigEntry *entry_Syscalls = &entries[7];
if (g_isApplication) { if (g_isApplication) {
entry_AppletType->Value[0] = AppletType_SystemApplication; entry_AppletType->Value[0] = AppletType_SystemApplication;
entry_AppletType->Value[1] = EnvAppletFlags_ApplicationOverride; entry_AppletType->Value[1] = EnvAppletFlags_ApplicationOverride;
} }
if (!g_isCodeMemoryAvailable) {
// Revoke access to code memory syscalls if own-process code memory is not available.
entry_Syscalls->Value[0x4B/64] &= ~(1UL << (0x4B%64)); // svcCreateCodeMemory
entry_Syscalls->Value[0x4C/64] &= ~(1UL << (0x4C%64)); // svcControlCodeMemory
}
// MainThreadHandle // MainThreadHandle
entries[0].Value[0] = envGetMainThreadHandle(); entries[0].Value[0] = envGetMainThreadHandle();
// ProcessHandle // ProcessHandle
@ -469,6 +502,7 @@ int main(int argc, char **argv)
smExit(); // Close SM as we don't need it anymore. smExit(); // Close SM as we don't need it anymore.
setupHbHeap(); setupHbHeap();
getOwnProcessHandle(); getOwnProcessHandle();
getIsCodeMemoryAvailable();
loadNro(); loadNro();
fatalThrow(MAKERESULT(Module_HomebrewLoader, 8)); fatalThrow(MAKERESULT(Module_HomebrewLoader, 8));