2
1
Fork 0
mirror of https://github.com/yuzu-emu/yuzu.git synced 2024-07-04 23:31:19 +01:00

kernel/shared_memory: Sanitize supplied size when unmapping

The kernel makes sure that the given size to unmap is always the same
size as the entire region managed by the shared memory instance,
otherwise it returns an error code signifying an invalid size.

This is similarly done for transfer memory (which we already check for).
This commit is contained in:
Lioncash 2019-03-29 18:01:38 -04:00
parent f770c17d01
commit c6147a439d
3 changed files with 18 additions and 4 deletions

View file

@ -119,7 +119,15 @@ ResultCode SharedMemory::Map(Process& target_process, VAddr address, MemoryPermi
ConvertPermissions(permissions)); ConvertPermissions(permissions));
} }
ResultCode SharedMemory::Unmap(Process& target_process, VAddr address) { ResultCode SharedMemory::Unmap(Process& target_process, VAddr address, u64 unmap_size) {
if (unmap_size != size) {
LOG_ERROR(Kernel,
"Invalid size passed to Unmap. Size must be equal to the size of the "
"memory managed. Shared memory size=0x{:016X}, Unmap size=0x{:016X}",
size, unmap_size);
return ERR_INVALID_SIZE;
}
// TODO(Subv): Verify what happens if the application tries to unmap an address that is not // TODO(Subv): Verify what happens if the application tries to unmap an address that is not
// mapped to a SharedMemory. // mapped to a SharedMemory.
return target_process.VMManager().UnmapRange(address, size); return target_process.VMManager().UnmapRange(address, size);

View file

@ -104,11 +104,17 @@ public:
/** /**
* Unmaps a shared memory block from the specified address in system memory * Unmaps a shared memory block from the specified address in system memory
*
* @param target_process Process from which to unmap the memory block. * @param target_process Process from which to unmap the memory block.
* @param address Address in system memory where the shared memory block is mapped * @param address Address in system memory where the shared memory block is mapped.
* @param unmap_size The amount of bytes to unmap from this shared memory instance.
*
* @return Result code of the unmap operation * @return Result code of the unmap operation
*
* @pre The given size to unmap must be the same size as the amount of memory managed by
* the SharedMemory instance itself, otherwise ERR_INVALID_SIZE will be returned.
*/ */
ResultCode Unmap(Process& target_process, VAddr address); ResultCode Unmap(Process& target_process, VAddr address, u64 unmap_size);
/** /**
* Gets a pointer to the shared memory block * Gets a pointer to the shared memory block

View file

@ -1140,7 +1140,7 @@ static ResultCode UnmapSharedMemory(Handle shared_memory_handle, VAddr addr, u64
return ERR_INVALID_MEMORY_RANGE; return ERR_INVALID_MEMORY_RANGE;
} }
return shared_memory->Unmap(*current_process, addr); return shared_memory->Unmap(*current_process, addr, size);
} }
static ResultCode QueryProcessMemory(VAddr memory_info_address, VAddr page_info_address, static ResultCode QueryProcessMemory(VAddr memory_info_address, VAddr page_info_address,