OmniNX/Atmosphere
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kern: improve KMemoryManager pool detection

Browse Source
This commit is contained in:
Michael Scire
2020-12-01 17:03:00 -08:00
committed by SciresM
parent aac8af8bf5
commit 1ca64cf2a1
3 changed files with 70 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libraries/libmesosphere/source/kern_initial_process.cpp
View File

@@ -26,7 +26,9 @@ namespace ams::kern {
};
KVirtualAddress GetInitialProcessBinaryAddress() {
return KMemoryLayout::GetPageTableHeapRegion().GetEndAddress() - InitialProcessBinarySizeMax;
const uintptr_t end_address = KMemoryLayout::GetPageTableHeapRegion().GetEndAddress();
MESOSPHERE_ABORT_UNLESS(end_address != 0);
return end_address - InitialProcessBinarySizeMax;
}
void LoadInitialProcessBinaryHeader(InitialProcessBinaryHeader *header) {
@@ -97,8 +99,11 @@ namespace ams::kern {
/* Ensure that we do not leak pages. */
ON_SCOPE_EXIT { pg.Close(); };
/* Map the process's memory into the temporary region. */
/* Get the temporary region. */
const auto &temp_region = KMemoryLayout::GetTempRegion();
MESOSPHERE_ABORT_UNLESS(temp_region.GetEndAddress() != 0);
/* Map the process's memory into the temporary region. */
KProcessAddress temp_address = Null<KProcessAddress>;
MESOSPHERE_R_ABORT_UNLESS(Kernel::GetKernelPageTable().MapPageGroup(std::addressof(temp_address), pg, temp_region.GetAddress(), temp_region.GetSize() / PageSize, KMemoryState_Kernel, KMemoryPermission_KernelReadWrite));