kernel:fix sys_osem_trywait merge issue

fix sys_osem_post on wrong descriptor
RPCSX · Nov 21, 2024 · 661a718 · 661a718
1 parent afde24f
commit 661a718
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/orbis-kernel/src/sys/sys_sce.cpp b/orbis-kernel/src/sys/sys_sce.cpp
@@ -609,7 +609,9 @@ orbis::SysResult orbis::sys_osem_trywait(Thread *thread, sint id, sint need) {
     return ErrorCode::BADF;
   }
 
+  if (need < 1 || need > sem->maxValue) {
     return ErrorCode::INVAL;
+  }
 
   std::lock_guard lock(sem->mtx);
   if (sem->isDeleted || sem->value < need)
@@ -620,8 +622,12 @@ orbis::SysResult orbis::sys_osem_trywait(Thread *thread, sint id, sint need) {
 orbis::SysResult orbis::sys_osem_post(Thread *thread, sint id, sint count) {
   ORBIS_LOG_TRACE(__FUNCTION__, thread, id, count);
   Ref<Semaphore> sem = thread->tproc->semMap.get(id);
-  if (count < 1 || count > sem->maxValue - sem->value)
+  if (sem == nullptr) {
+    return ErrorCode::BADF;
+  }
+  if (count < 1 || count > sem->maxValue - sem->value) {
     return ErrorCode::INVAL;
+  }
 
   std::lock_guard lock(sem->mtx);
   if (sem->isDeleted)