LowLevel/Luma3DS-3GX
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

revert fsldr change, fix null deref in pm

Browse Source
This commit is contained in:
TuxSH
2019-03-29 22:40:54 +01:00
parent e688ec9257
commit ef034a87d4
6 changed files with 61 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sysmodules/pm/source/launch.c
View File

@@ -205,8 +205,11 @@ static Result loadWithDependencies(Handle *outDebug, ProcessData **outProcessDat
static Result launchTitleImpl(Handle *debug, ProcessData **outProcessData, const FS_ProgramInfo *programInfo,
const FS_ProgramInfo *programInfoUpdate, u32 launchFlags, ExHeader_Info *exheaderInfo)
{
if (isTitleLaunchPrevented(programInfo->programId)) {
if (debug != NULL) {
*debug = 0;
}
if (isTitleLaunchPrevented(programInfo->programId)) {
return 0;
}

15
sysmodules/pm/source/luma.c
View File

@@ -16,19 +16,4 @@ bool isTitleLaunchPrevented(u64 titleId)
svcGetSystemInfo(&numKips, 26, 0);
return numKips >= 6 && (titleId & ~N3DS_TID_BIT) == 0x0004003000008A02ULL; // ErrDisp
}
Result fsRegSetupPermissionsForKip(u32 pid, u64 titleId)
{
FS_ProgramInfo info;
ExHeader_Arm11StorageInfo storageInfo = {
.fs_access_info = FSACCESS_NANDRO_RW | FSACCESS_NANDRW | FSACCESS_SDMC_RW,
};
// Non-dummy TID
info.programId = titleId;
info.mediaType = MEDIATYPE_NAND;
return FSREG_Register(pid, 0xFFFF000000000000LL, &info, &storageInfo);;
}

3
sysmodules/pm/source/luma.h
View File

@@ -3,5 +3,4 @@
#include <3ds/types.h>
u32 getKExtSize(void);
bool isTitleLaunchPrevented(u64 titleId);
Result fsRegSetupPermissionsForKip(u32 pid, u64 titleId);
bool isTitleLaunchPrevented(u64 titleId);

7
sysmodules/pm/source/manager.c
View File

@@ -42,13 +42,6 @@ void Manager_RegisterKips(void)
}
ProcessList_Unlock(&g_manager.processList);
// Register loader, pm, and rosalina (if applicable)
assertSuccess(fsRegSetupPermissionsForKip(1, 0x0004013000001302LL)); // loader
assertSuccess(fsRegSetupPermissionsForKip(2, 0x0004013000001202LL)); // pm
if (numKips >= 6) {
assertSuccess(fsRegSetupPermissionsForKip(5, 0x0004013000006902LL)); // rosalina
}
}
Result UnregisterProcess(u64 titleId)