mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-06-22 04:52:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

virtmem: Fix minor regression

Browse Source 
We need to fetch alias region to make sure virtmemReserve() avoids returning addresses inside of it
This commit is contained in:
plutooo 2018-10-23 04:07:01 +02:00
parent e942b9cc25
commit 6977cb24f5
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nx/source/kernel/virtmem.c
View File

@ -14,6 +14,7 @@ typedef struct {
enum { enum {
REGION_STACK=0, REGION_STACK=0,
REGION_HEAP=1, REGION_HEAP=1,
REGION_LEGACY_ALIAS=2,
REGION_MAX REGION_MAX
}; };
@ -82,6 +83,8 @@ void virtmemSetup(void) {
if (R_FAILED(_GetRegionFromInfo(&g_Region[REGION_HEAP], 4, 5))) { if (R_FAILED(_GetRegionFromInfo(&g_Region[REGION_HEAP], 4, 5))) {
fatalSimple(MAKERESULT(Module_Libnx, LibnxError_BadGetInfo_Heap)); fatalSimple(MAKERESULT(Module_Libnx, LibnxError_BadGetInfo_Heap));
} }
_GetRegionFromInfo(&g_Region[REGION_LEGACY_ALIAS], 2, 3);
} }
void* virtmemReserve(size_t size) { void* virtmemReserve(size_t size) {
@ -128,11 +131,7 @@ void* virtmemReserve(size_t size) {
{ {
u64 end = addr + size - 1; u64 end = addr + size - 1;
if (_InRegion(&g_Region[i], addr)) { if (_InRegion(&g_Region[i], addr) || _InRegion(&g_Region[i], end)) {
break;
}
if (_InRegion(&g_Region[i], end)) {
break; break;
} }
} }