mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-08-05 08:52:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Return error codes to guest from map/unmap memory instead crash

Browse Source
This commit is contained in:
mailwl 2025-01-16 15:51:54 +03:00
parent 1c3048ccc2
commit 988f66d326
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/memory.cpp
View File

@ -290,7 +290,12 @@ int MemoryManager::MapMemory(void** out_addr, VAddr virtual_addr, size_t size, M
// This should return SCE_KERNEL_ERROR_ENOMEM but shouldn't normally happen. // This should return SCE_KERNEL_ERROR_ENOMEM but shouldn't normally happen.
const auto& vma = FindVMA(mapped_addr)->second; const auto& vma = FindVMA(mapped_addr)->second;
const size_t remaining_size = vma.base + vma.size - mapped_addr; const size_t remaining_size = vma.base + vma.size - mapped_addr;
ASSERT_MSG(!vma.IsMapped() && remaining_size >= size); if (vma.IsMapped()) {
return ORBIS_KERNEL_ERROR_EBUSY;
}
if (remaining_size < size) {
return ORBIS_KERNEL_ERROR_ENOMEM;
}
} }
// Find the first free area starting with provided virtual address. // Find the first free area starting with provided virtual address.
@ -392,8 +397,9 @@ s32 MemoryManager::UnmapMemory(VAddr virtual_addr, size_t size) {
s32 MemoryManager::UnmapMemoryImpl(VAddr virtual_addr, size_t size) { s32 MemoryManager::UnmapMemoryImpl(VAddr virtual_addr, size_t size) {
const auto it = FindVMA(virtual_addr); const auto it = FindVMA(virtual_addr);
const auto& vma_base = it->second; const auto& vma_base = it->second;
ASSERT_MSG(vma_base.Contains(virtual_addr, size), if (!vma_base.Contains(virtual_addr, size)) {
"Existing mapping does not contain requested unmap range"); return ORBIS_KERNEL_ERROR_EINVAL;
}
const auto type = vma_base.type; const auto type = vma_base.type;
if (type == VMAType::Free) { if (type == VMAType::Free) {