summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2019-04-06 05:35:06 +0200
committerGitHub <noreply@github.com>2019-04-06 05:35:06 +0200
commit854ac468b9cdc16296bb78de22b459118706bbde (patch)
treeecf16bdfe7c64015c32bb74a011b111172aa6b8a
parentMerge pull request #2344 from lioncash/result (diff)
parentkernel/svc: Properly sanitize mutex address in WaitProcessWideKeyAtomic (diff)
downloadyuzu-854ac468b9cdc16296bb78de22b459118706bbde.tar
yuzu-854ac468b9cdc16296bb78de22b459118706bbde.tar.gz
yuzu-854ac468b9cdc16296bb78de22b459118706bbde.tar.bz2
yuzu-854ac468b9cdc16296bb78de22b459118706bbde.tar.lz
yuzu-854ac468b9cdc16296bb78de22b459118706bbde.tar.xz
yuzu-854ac468b9cdc16296bb78de22b459118706bbde.tar.zst
yuzu-854ac468b9cdc16296bb78de22b459118706bbde.zip
-rw-r--r--src/core/hle/kernel/svc.cpp14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp
index ab10db3df..2fd07ab34 100644
--- a/src/core/hle/kernel/svc.cpp
+++ b/src/core/hle/kernel/svc.cpp
@@ -1339,6 +1339,20 @@ static ResultCode WaitProcessWideKeyAtomic(VAddr mutex_addr, VAddr condition_var
"called mutex_addr={:X}, condition_variable_addr={:X}, thread_handle=0x{:08X}, timeout={}",
mutex_addr, condition_variable_addr, thread_handle, nano_seconds);
+ if (Memory::IsKernelVirtualAddress(mutex_addr)) {
+ LOG_ERROR(
+ Kernel_SVC,
+ "Given mutex address must not be within the kernel address space. address=0x{:016X}",
+ mutex_addr);
+ return ERR_INVALID_ADDRESS_STATE;
+ }
+
+ if (!Common::IsWordAligned(mutex_addr)) {
+ LOG_ERROR(Kernel_SVC, "Given mutex address must be word-aligned. address=0x{:016X}",
+ mutex_addr);
+ return ERR_INVALID_ADDRESS;
+ }
+
auto* const current_process = Core::System::GetInstance().Kernel().CurrentProcess();
const auto& handle_table = current_process->GetHandleTable();
SharedPtr<Thread> thread = handle_table.Get<Thread>(thread_handle);