From 28a378ca0d0d79cde23f557f84e5bf86164ed9a2 Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Sat, 15 Nov 2025 16:47:57 -0700 Subject: [PATCH] ro: fix loading of aligned-header NROs --- stratosphere/ro/source/impl/ro_nro_utils.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stratosphere/ro/source/impl/ro_nro_utils.cpp b/stratosphere/ro/source/impl/ro_nro_utils.cpp index 3f01a1c99..bd903c3b1 100644 --- a/stratosphere/ro/source/impl/ro_nro_utils.cpp +++ b/stratosphere/ro/source/impl/ro_nro_utils.cpp @@ -53,14 +53,14 @@ namespace ams::ro::impl { Result SetNroPerms(os::NativeHandle process_handle, u64 base_address, u64 rx_size, u64 ro_size, u64 rw_size, bool is_aligned_header) { const u64 rx_offset = is_aligned_header ? os::MemoryPageSize : 0; - const u64 ro_offset = rx_offset + rx_size; + const u64 ro_offset = rx_size; const u64 rw_offset = ro_offset + ro_size; if (is_aligned_header) { R_TRY(os::SetProcessMemoryPermission(process_handle, base_address, os::MemoryPageSize, os::MemoryPermission_ReadOnly)); } - R_TRY(os::SetProcessMemoryPermission(process_handle, base_address + rx_offset, rx_size, os::MemoryPermission_ReadExecute)); + R_TRY(os::SetProcessMemoryPermission(process_handle, base_address + rx_offset, rx_size - rx_offset, os::MemoryPermission_ReadExecute)); R_TRY(os::SetProcessMemoryPermission(process_handle, base_address + ro_offset, ro_size, os::MemoryPermission_ReadOnly)); R_TRY(os::SetProcessMemoryPermission(process_handle, base_address + rw_offset, rw_size, os::MemoryPermission_ReadWrite));