mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-12-09 13:19:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix alignment for mmap (#3716)

Browse Source
This commit is contained in:
Stephen Miller
2025-10-07 18:22:21 -05:00
committed by GitHub
parent b34556702e
commit 794d593a02
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -655,12 +655,18 @@ void* PS4_SYSV_ABI posix_mmap(void* addr, u64 len, s32 prot, s32 flags, s32 fd,
auto* memory = Core::Memory::Instance(); auto* memory = Core::Memory::Instance();
const auto mem_prot = static_cast<Core::MemoryProt>(prot); const auto mem_prot = static_cast<Core::MemoryProt>(prot);
const auto mem_flags = static_cast<Core::MemoryMapFlags>(flags); const auto mem_flags = static_cast<Core::MemoryMapFlags>(flags);
const auto vaddr = reinterpret_cast<VAddr>(addr);
// mmap is less restrictive than other functions in regards to alignment // Align address and size here. Both align up to the next page
// To avoid potential issues, align address and size here. const VAddr aligned_addr = Common::AlignUp(vaddr, 16_KB);
const VAddr aligned_addr = Common::AlignDown(std::bit_cast<VAddr>(addr), 16_KB);
const u64 aligned_size = Common::AlignUp(len, 16_KB); const u64 aligned_size = Common::AlignUp(len, 16_KB);
if (True(mem_flags & Core::MemoryMapFlags::Fixed) && vaddr != aligned_addr) {
// If flags Fixed is specified, the input address must be aligned.
ErrSceToPosix(ORBIS_KERNEL_ERROR_EINVAL);
return reinterpret_cast<void*>(-1);
}
s32 result = ORBIS_OK; s32 result = ORBIS_OK;
if (fd == -1) { if (fd == -1) {
result = memory->MapMemory(&addr_out, aligned_addr, aligned_size, mem_prot, mem_flags, result = memory->MapMemory(&addr_out, aligned_addr, aligned_size, mem_prot, mem_flags,