N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

service/ldr_ro: Fix CRO loading when the buffer contained multiple VM areas (#5125)

Browse source 
* vm_manager: Handle multiple areas in ChangeMemoryState

It is possible that a few areas have the same permisson and state, but with different backing pointers. Currently, this function assumes that only one continous area is found, but this is not always the case.

* service/ldr_ro: Handle multiple areas in VerifyBufferState

It is possible that the buffer passed from the game is made up of multiple areas with the same permisson and state but different backing pointers. Change the check to allow that.
This commit is contained in:
Pengfei Zhu 2020-03-28 20:26:54 +08:00 committed by GitHub
parent 475b0fb159
commit 3edc4a3055
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/core/hle/kernel/vm_manager.cpp
View file

@ -151,13 +151,16 @@ ResultCode VMManager::ChangeMemoryState(VAddr target, u32 size, MemoryState expe
} }
CASCADE_RESULT(auto vma, CarveVMARange(target, size)); CASCADE_RESULT(auto vma, CarveVMARange(target, size));
ASSERT(vma->second.size == size);
vma->second.permissions = new_perms; const VMAIter end = vma_map.end();
vma->second.meminfo_state = new_state; // The comparison against the end of the range must be done using addresses since VMAs can be
UpdatePageTableForVMA(vma->second); // merged during this process, causing invalidation of the iterators.
while (vma != end && vma->second.base < target_end) {
MergeAdjacent(vma); vma->second.permissions = new_perms;
vma->second.meminfo_state = new_state;
UpdatePageTableForVMA(vma->second);
vma = std::next(MergeAdjacent(vma));
}
return RESULT_SUCCESS; return RESULT_SUCCESS;
} }

15
src/core/hle/service/ldr_ro/ldr_ro.cpp
View file

@ -41,10 +41,17 @@ static const ResultCode ERROR_NOT_LOADED = // 0xD8A12C0D
static bool VerifyBufferState(Kernel::Process& process, VAddr buffer_ptr, u32 size) { static bool VerifyBufferState(Kernel::Process& process, VAddr buffer_ptr, u32 size) {
auto vma = process.vm_manager.FindVMA(buffer_ptr); auto vma = process.vm_manager.FindVMA(buffer_ptr);
return vma != process.vm_manager.vma_map.end() && while (vma != process.vm_manager.vma_map.end()) {
vma->second.base + vma->second.size >= buffer_ptr + size && if (vma->second.permissions != Kernel::VMAPermission::ReadWrite ||
vma->second.permissions == Kernel::VMAPermission::ReadWrite && vma->second.meminfo_state != Kernel::MemoryState::Private) {
vma->second.meminfo_state == Kernel::MemoryState::Private; return false;
}
if (vma->second.base + vma->second.size >= buffer_ptr + size) {
return true;
}
vma = std::next(vma);
}
return false;
} }
void RO::Initialize(Kernel::HLERequestContext& ctx) { void RO::Initialize(Kernel::HLERequestContext& ctx) {