mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-01-06 00:59:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix sys_vm address boundary checks (fix vsize)

Browse Source
This commit is contained in:
Eladash 2019-07-28 23:41:07 +03:00 committed by Ivan
parent ecb3b62787
commit a832581201
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rpcs3/Emu/Cell/lv2/sys_vm.cpp
View File

@ -3,11 +3,11 @@
#include "Emu/Cell/PPUThread.h"
#include "Emu/Memory/vm_locking.h"
sys_vm_t::sys_vm_t(const std::shared_ptr<vm::block_t>& area, const std::shared_ptr<lv2_memory_container>& ct, u32 psize)
sys_vm_t::sys_vm_t(u32 _addr, u32 vsize, const std::shared_ptr<lv2_memory_container>& ct, u32 psize)
: ct(ct)
, psize(psize)
, addr(area->addr)
, size(area->size)
, addr(_addr)
, size(vsize)
{
// Write ID
g_ids[addr >> 28].release(idm::last_id());
@ -56,7 +56,7 @@ error_code sys_vm_memory_map(ppu_thread& ppu, u32 vsize, u32 psize, u32 cid, u64
// Alloc all memory (shall not fail)
verify(HERE), area->alloc(vsize);
idm::make<sys_vm_t>(area, ct, psize);
idm::make<sys_vm_t>(area->addr, vsize, ct, psize);
// Write a pointer for the allocated memory
*addr = area->addr;

2
rpcs3/Emu/Cell/lv2/sys_vm.h
View File

@ -41,7 +41,7 @@ struct sys_vm_t
u32 psize;
shared_mutex mutex;
sys_vm_t(const std::shared_ptr<vm::block_t>& area, const std::shared_ptr<lv2_memory_container>& ct, u32 psize);
sys_vm_t(u32 addr, u32 vsize, const std::shared_ptr<lv2_memory_container>& ct, u32 psize);
~sys_vm_t();
static std::array<atomic_t<u32>, id_count> g_ids;