citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

Process: check source/target overlap for Map/Unmap

This commit is contained in:
Weiyi Wang 2018-11-11 12:38:52 -05:00
parent 3db8915356
commit 29ade3e610
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/core/hle/kernel/process.cpp
View File

@ -321,15 +321,21 @@ ResultCode Process::Map(VAddr target, VAddr source, u32 size, VMAPermission perm
return ERR_INVALID_ADDRESS_STATE; return ERR_INVALID_ADDRESS_STATE;
} }
if (source == target) { // Check range overlapping
if (source - target < size || target - source < size) {
if (privileged) { if (privileged) {
// privileged Map allows identical source and target address, which simply changes the if (source == target) {
// state and the permission of the memory // privileged Map allows identical source and target address, which simply changes
return vm_manager.ChangeMemoryState(source, size, MemoryState::Private, // the state and the permission of the memory
VMAPermission::ReadWrite, MemoryState::AliasCode, return vm_manager.ChangeMemoryState(source, size, MemoryState::Private,
perms); VMAPermission::ReadWrite,
MemoryState::AliasCode, perms);
} else {
return ERR_INVALID_ADDRESS;
}
} else {
return ERR_INVALID_ADDRESS_STATE;
} }
return ERR_INVALID_ADDRESS_STATE;
} }
MemoryState source_state = privileged ? MemoryState::Locked : MemoryState::Aliased; MemoryState source_state = privileged ? MemoryState::Locked : MemoryState::Aliased;
@ -367,14 +373,20 @@ ResultCode Process::Unmap(VAddr target, VAddr source, u32 size, VMAPermission pe
// TODO(wwylele): check that the source and the target are actually a pair created by Map // TODO(wwylele): check that the source and the target are actually a pair created by Map
// Should return error 0xD8E007F5 in this case // Should return error 0xD8E007F5 in this case
if (source == target) { if (source - target < size || target - source < size) {
if (privileged) { if (privileged) {
// privileged Unmap allows identical source and target address, which simply changes if (source == target) {
// the state and the permission of the memory // privileged Unmap allows identical source and target address, which simply changes
return vm_manager.ChangeMemoryState(source, size, MemoryState::AliasCode, // the state and the permission of the memory
VMAPermission::None, MemoryState::Private, perms); return vm_manager.ChangeMemoryState(source, size, MemoryState::AliasCode,
VMAPermission::None, MemoryState::Private,
perms);
} else {
return ERR_INVALID_ADDRESS;
}
} else {
return ERR_INVALID_ADDRESS_STATE;
} }
return ERR_INVALID_ADDRESS_STATE;
} }
MemoryState source_state = privileged ? MemoryState::Locked : MemoryState::Aliased; MemoryState source_state = privileged ? MemoryState::Locked : MemoryState::Aliased;