dahjah/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2026-06-10 11:45:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

core/memory: handle Fixed mapping with zero addr in callers (#4507)

Browse Source 
Add check in sceKernelReserveVirtualRange, sceKernelMapNamedDirectMemory, and
sceKernelMapNamedFlexibleMemory per StevenMiller123 review:
- FW >= 1.70 returns EINVAL for Fixed + addr == 0
- Older FW clears Fixed flag to fall through to managed allocation

Co-authored-by: opencode <dev@shadps4.local>
This commit is contained in:
Arthur Cuesta 2026-06-05 16:11:57 -03:00 committed by GitHub
parent 6c282aa1da
commit 35255bccef
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/core/libraries/kernel/memory.cpp
View File

@ -169,7 +169,14 @@ s32 PS4_SYSV_ABI sceKernelReserveVirtualRange(void** addr, u64 len, s32 flags, u
auto* memory = Core::Memory::Instance();
const VAddr in_addr = reinterpret_cast<VAddr>(*addr);
const auto map_flags = static_cast<Core::MemoryMapFlags>(flags);
auto map_flags = static_cast<Core::MemoryMapFlags>(flags);
if (True(map_flags & Core::MemoryMapFlags::Fixed) && in_addr == 0) {
if (Common::ElfInfo::FW_170 <= g_sdk_version) {
return ORBIS_KERNEL_ERROR_EINVAL;
}
map_flags &= ~Core::MemoryMapFlags::Fixed;
}
s32 result = memory->MapMemory(addr, in_addr, len, Core::MemoryProt::NoAccess, map_flags,
Core::VMAType::Reserved, "anon", false, -1, alignment);
@ -214,7 +221,7 @@ s32 PS4_SYSV_ABI sceKernelMapNamedDirectMemory(void** addr, u64 len, s32 prot, s
return ORBIS_KERNEL_ERROR_EACCES;
}
const auto map_flags = static_cast<Core::MemoryMapFlags>(flags);
auto map_flags = static_cast<Core::MemoryMapFlags>(flags);
const VAddr in_addr = reinterpret_cast<VAddr>(*addr);
auto* memory = Core::Memory::Instance();
@ -224,6 +231,14 @@ s32 PS4_SYSV_ABI sceKernelMapNamedDirectMemory(void** addr, u64 len, s32 prot, s
// Under these conditions, this would normally redirect to sceKernelMapDirectMemory2.
should_check = !g_alias_dmem;
}
if (True(map_flags & Core::MemoryMapFlags::Fixed) && in_addr == 0) {
if (Common::ElfInfo::FW_170 <= g_sdk_version) {
return ORBIS_KERNEL_ERROR_EINVAL;
}
map_flags &= ~Core::MemoryMapFlags::Fixed;
}
const auto ret =
memory->MapMemory(addr, in_addr, len, mem_prot, map_flags, Core::VMAType::Direct, name,
should_check, phys_addr, alignment);
@ -307,8 +322,16 @@ s32 PS4_SYSV_ABI sceKernelMapNamedFlexibleMemory(void** addr_in_out, u64 len, s3
const VAddr in_addr = reinterpret_cast<VAddr>(*addr_in_out);
const auto mem_prot = static_cast<Core::MemoryProt>(prot);
const auto map_flags = static_cast<Core::MemoryMapFlags>(flags);
auto map_flags = static_cast<Core::MemoryMapFlags>(flags);
auto* memory = Core::Memory::Instance();
if (True(map_flags & Core::MemoryMapFlags::Fixed) && in_addr == 0) {
if (Common::ElfInfo::FW_170 <= g_sdk_version) {
return ORBIS_KERNEL_ERROR_EINVAL;
}
map_flags &= ~Core::MemoryMapFlags::Fixed;
}
const auto ret = memory->MapMemory(addr_in_out, in_addr, len, mem_prot, map_flags,
Core::VMAType::Flexible, name);
LOG_INFO(Kernel_Vmm, "out_addr = {}", fmt::ptr(*addr_in_out));