diff options
author | Lioncash <mathew1800@gmail.com> | 2018-10-18 13:01:26 -0400 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2018-10-18 13:01:29 -0400 |
commit | 4b5ae8dbaa267d0f269ded8e621b43065fb5ae20 (patch) | |
tree | 95163871607854a07df6c2647a4d6babb42af873 | |
parent | 541e9624eb69bb79f9d2f50c98a05445c54a220c (diff) |
svc: Check for word alignment of addresses within svcArbitrateLock/svcArbitrateUnlock
The kernel itself checks whether or not the provided addresses are word
aligned before continuing, so we should be doing the same.
-rw-r--r-- | src/core/hle/kernel/svc.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index b0bdd822e..d3c9d50b5 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp @@ -350,6 +350,10 @@ static ResultCode ArbitrateLock(Handle holding_thread_handle, VAddr mutex_addr, return ERR_INVALID_ADDRESS_STATE; } + if (!Common::IsWordAligned(mutex_addr)) { + return ERR_INVALID_ADDRESS; + } + auto& handle_table = Core::System::GetInstance().Kernel().HandleTable(); return Mutex::TryAcquire(handle_table, mutex_addr, holding_thread_handle, requesting_thread_handle); @@ -363,6 +367,10 @@ static ResultCode ArbitrateUnlock(VAddr mutex_addr) { return ERR_INVALID_ADDRESS_STATE; } + if (!Common::IsWordAligned(mutex_addr)) { + return ERR_INVALID_ADDRESS; + } + return Mutex::Release(mutex_addr); } |