From 6977cb24f54bcff5546d5eea8f09c52bf5524737 Mon Sep 17 00:00:00 2001
From: plutooo <plutooo@users.noreply.github.com>
Date: Tue, 23 Oct 2018 04:07:01 +0200
Subject: [PATCH] virtmem: Fix minor regression
We need to fetch alias region to make sure virtmemReserve() avoids returning addresses inside of it
---
nx/source/kernel/virtmem.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/nx/source/kernel/virtmem.c b/nx/source/kernel/virtmem.c
index 7c08fcab..5dc7dd15 100644
--- a/nx/source/kernel/virtmem.c
+++ b/nx/source/kernel/virtmem.c
@@ -14,6 +14,7 @@ typedef struct {
enum {
REGION_STACK=0,
REGION_HEAP=1,
+ REGION_LEGACY_ALIAS=2,
REGION_MAX
};
@@ -82,6 +83,8 @@ void virtmemSetup(void) {
if (R_FAILED(_GetRegionFromInfo(&g_Region[REGION_HEAP], 4, 5))) {
fatalSimple(MAKERESULT(Module_Libnx, LibnxError_BadGetInfo_Heap));
}
+
+ _GetRegionFromInfo(&g_Region[REGION_LEGACY_ALIAS], 2, 3);
}
void* virtmemReserve(size_t size) {
@@ -128,11 +131,7 @@ void* virtmemReserve(size_t size) {
{
u64 end = addr + size - 1;
- if (_InRegion(&g_Region[i], addr)) {
- break;
- }
-
- if (_InRegion(&g_Region[i], end)) {
+ if (_InRegion(&g_Region[i], addr) || _InRegion(&g_Region[i], end)) {
break;
}
}