diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-05-28 20:38:12 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-05-28 20:38:12 +0000 |
| commit | 7c8d65e83558f0d90526b28cba00c5c0aef7ada0 (patch) | |
| tree | 2f2289a752951f481a3568cd6ccb4b6c52c5f2cc /cpukit/score/src/coremutex.c | |
| parent | 2009-05-28 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
| download | rtems-7c8d65e83558f0d90526b28cba00c5c0aef7ada0.tar.bz2 | |
2009-05-28 Joel Sherrill <joel.sherrill@OARcorp.com>
PR 1415/cpukit
* rtems/src/semcreate.c, rtems/src/semtranslatereturncode.c,
score/include/rtems/score/coremutex.h,
score/inline/rtems/score/coremutex.inl, score/src/coremutex.c:
Address two paths where a task with a priority above the ceiling
could obtain a priority ceiling mutex.
Diffstat (limited to 'cpukit/score/src/coremutex.c')
| -rw-r--r-- | cpukit/score/src/coremutex.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cpukit/score/src/coremutex.c b/cpukit/score/src/coremutex.c index 24b36cbef1..6d8a64e75d 100644 --- a/cpukit/score/src/coremutex.c +++ b/cpukit/score/src/coremutex.c @@ -42,7 +42,7 @@ * Output parameters: NONE */ -void _CORE_mutex_Initialize( +CORE_mutex_Status _CORE_mutex_Initialize( CORE_mutex_Control *the_mutex, CORE_mutex_Attributes *the_mutex_attributes, uint32_t initial_lock @@ -65,6 +65,9 @@ void _CORE_mutex_Initialize( if ( _CORE_mutex_Is_inherit_priority( &the_mutex->Attributes ) || _CORE_mutex_Is_priority_ceiling( &the_mutex->Attributes ) ) { + if ( _Thread_Executing->current_priority < + the_mutex->Attributes.priority_ceiling ) + return CORE_MUTEX_STATUS_CEILING_VIOLATED; #ifdef __RTEMS_STRICT_ORDER_MUTEX__ _Chain_Prepend_unprotected( &_Thread_Executing->lock_mutex, &the_mutex->queue.lock_queue ); @@ -86,4 +89,6 @@ void _CORE_mutex_Initialize( STATES_WAITING_FOR_MUTEX, CORE_MUTEX_TIMEOUT ); + + return CORE_MUTEX_STATUS_SUCCESSFUL; } |