summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2009-03-02 16:13:58 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2009-03-02 16:13:58 +0000
commit6224a3bdfa0c9d737419c782e48a8dada30ce1bd (patch)
treeda4778d99b289ab20349540141add93cebc4c6dd
parent0d1d4509c9c8418ebc651ab861720573130fd313 (diff)
2009-03-02 Joel Sherrill <joel.sherrill@OARcorp.com>
PR 1388/cpukit * rtems/src/semcreate.c: Classic Semaphores allow both priority inherit and ceiling attributes to be set on semaphore create. These attributes are mutually exclusive and this should be an error.
-rw-r--r--cpukit/ChangeLog7
-rw-r--r--cpukit/rtems/src/semcreate.c6
2 files changed, 12 insertions, 1 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 3e2ce1500a..47e56e17b5 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,10 @@
+2009-03-02 Joel Sherrill <joel.sherrill@OARcorp.com>
+
+ PR 1388/cpukit
+ * rtems/src/semcreate.c: Classic Semaphores allow both priority inherit
+ and ceiling attributes to be set on semaphore create. These
+ attributes are mutually exclusive and this should be an error.
+
2009-01-29 Nickolay Semyonov-Kolchin <nbkolchin@gmail.com>
PR 1359/cpukit
diff --git a/cpukit/rtems/src/semcreate.c b/cpukit/rtems/src/semcreate.c
index ec34436b87..d7827c116c 100644
--- a/cpukit/rtems/src/semcreate.c
+++ b/cpukit/rtems/src/semcreate.c
@@ -15,7 +15,7 @@
* + acquire a semaphore
* + release a semaphore
*
- * COPYRIGHT (c) 1989-1999.
+ * COPYRIGHT (c) 1989-2009.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
@@ -111,6 +111,10 @@ rtems_status_code rtems_semaphore_create(
}
+ if ( _Attributes_Is_inherit_priority( attribute_set ) &&
+ _Attributes_Is_priority_ceiling( attribute_set ) )
+ return RTEMS_NOT_DEFINED;
+
if ( !_Attributes_Is_counting_semaphore( attribute_set ) && ( count > 1 ) )
return RTEMS_INVALID_NUMBER;