score: Use thread life protection for API mutexes

This prevents that asynchronous thread deletion can lead to an unusable
allocator or once mutex.

1 files changed, 16 insertions, 10 deletions

diff --git a/cpukit/score/src/apimutexunlock.c b/cpukit/score/src/apimutexunlock.c
index 43bdfe8bbe..d0432a6f4a 100644
--- a/cpukit/score/src/apimutexunlock.c
+++ b/cpukit/score/src/apimutexunlock.c
@@ -19,19 +19,25 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/score/apimutex.h>
 #include <rtems/score/coremuteximpl.h>
 
-void _API_Mutex_Unlock(
-  API_Mutex_Control *the_mutex
-)
+void _API_Mutex_Unlock( API_Mutex_Control *the_mutex )
 {
-   _Thread_Disable_dispatch();
-    _CORE_mutex_Surrender(
-      &the_mutex->Mutex,
-      the_mutex->Object.id,
-      NULL
-   );
+  bool previous_thread_life_protection;
+  bool restore_thread_life_protection;
+
+  _Thread_Disable_dispatch();
+
+  previous_thread_life_protection =
+    the_mutex->previous_thread_life_protection;
+  restore_thread_life_protection = the_mutex->Mutex.nest_count == 1;
+
+  _CORE_mutex_Surrender( &the_mutex->Mutex, the_mutex->Object.id, NULL );
+
   _Thread_Enable_dispatch();
+
+  if ( restore_thread_life_protection ) {
+    _Thread_Set_life_protection( previous_thread_life_protection );
+  }
 }