xnu-3789.1.32.tar.gz

[apple/xnu.git] / bsd / sys / sem_internal.h

diff --git a/bsd/sys/sem_internal.h b/bsd/sys/sem_internal.h
index 0d0db0daedf6c3b94ecf06d774400a65237aac47..bf697a1eadb8888a0e90b0efefb6bd78b1dddd74 100644 (file)
--- a/bsd/sys/sem_internal.h
+++ b/bsd/sys/sem_internal.h
@@ -1,31 +1,35 @@
 /*
 /*

- * Copyright (c) 2006 Apple Computer, Inc. All Rights Reserved.
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

  * 
  * 

- * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.

  * 
  * 

- * This file contains Original Code and/or Modifications of Original Code 
- * as defined in and that are subject to the Apple Public Source License 
- * Version 2.0 (the 'License'). You may not use this file except in 
- * compliance with the License.  The rights granted to you under the 
- * License may not be used to create, or enable the creation or 
- * redistribution of, unlawful or unlicensed copies of an Apple operating 
- * system, or to circumvent, violate, or enable the circumvention or 
- * violation of, any terms of an Apple operating system software license 
- * agreement.
- *
- * Please obtain a copy of the License at 
- * http://www.opensource.apple.com/apsl/ and read it before using this 
- * file.
- *
- * The Original Code and all software distributed under the License are 
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER 
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, 
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, 
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
- * Please see the License for the specific language governing rights and 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and

  * limitations under the License.
  * limitations under the License.

- *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * NOTICE: This file was modified by SPARTA, Inc. in 2005 to introduce
+ * support for mandatory and extensible security protections.  This notice
+ * is included in support of clause 2.2 (b) of the Apple Public License,
+ * Version 2.0.

  */
 /*     $NetBSD: sem.h,v 1.5 1994/06/29 06:45:15 cgd Exp $      */
 
  */
 /*     $NetBSD: sem.h,v 1.5 1994/06/29 06:45:15 cgd Exp $      */
 


@@ -66,6 +70,34 @@ struct user_semid_ds {
        __int32_t       sem_pad3[4];    /* RESERVED: DO NOT USE! */
 };
 
        __int32_t       sem_pad3[4];    /* RESERVED: DO NOT USE! */
 };
 

+#pragma pack(4)
+struct user64_semid_ds {
+       struct ipc_perm sem_perm;       /* [XSI] operation permission struct */
+       int32_t sem_base;       /* 32 bit base ptr for semaphore set */
+       unsigned short  sem_nsems;      /* [XSI] number of sems in set */
+       user64_time_t   sem_otime;      /* [XSI] last operation time */
+       int32_t sem_pad1;       /* RESERVED: DO NOT USE! */
+       user64_time_t   sem_ctime;      /* [XSI] last change time */
+                                       /* Times measured in secs since */
+                                       /* 00:00:00 GMT, Jan. 1, 1970 */
+       int32_t sem_pad2;       /* RESERVED: DO NOT USE! */
+       int32_t sem_pad3[4];    /* RESERVED: DO NOT USE! */
+};
+
+struct user32_semid_ds {
+       struct ipc_perm sem_perm;       /* [XSI] operation permission struct */
+       int32_t sem_base;       /* 32 bit base ptr for semaphore set */
+       unsigned short  sem_nsems;      /* [XSI] number of sems in set */
+       user32_time_t   sem_otime;      /* [XSI] last operation time */
+       int32_t sem_pad1;       /* RESERVED: DO NOT USE! */
+       user32_time_t   sem_ctime;      /* [XSI] last change time */
+                                       /* Times measured in secs since */
+                                       /* 00:00:00 GMT, Jan. 1, 1970 */
+       int32_t sem_pad2;       /* RESERVED: DO NOT USE! */
+       int32_t sem_pad3[4];    /* RESERVED: DO NOT USE! */
+};
+#pragma pack()
+

 union user_semun {
        user_addr_t     buf;            /* buffer for IPC_STAT & IPC_SET */
        user_addr_t     array;          /* array for GETALL & SETALL */
 union user_semun {
        user_addr_t     buf;            /* buffer for IPC_STAT & IPC_SET */
        user_addr_t     array;          /* array for GETALL & SETALL */


@@ -114,7 +146,7 @@ typedef union user_semun user_semun_t;
 #define SEMMSL SEMMNS          /* max # of semaphores per id */
 #endif
 #ifndef SEMOPM
 #define SEMMSL SEMMNS          /* max # of semaphores per id */
 #endif
 #ifndef SEMOPM

-#define SEMOPM 100             /* max # of operations per semop call */
+#define SEMOPM 5               /* max # of operations per semop call */

 #endif
 
 
 #endif
 
 


@@ -122,7 +154,7 @@ typedef union user_semun user_semun_t;
  * Undo structure (internal: one per process)
  */
 struct sem_undo {
  * Undo structure (internal: one per process)
  */
 struct sem_undo {

-       struct  sem_undo *un_next;      /* ptr to next active undo structure */
+       int     un_next_idx;    /* index of next active undo structure */

        struct  proc *un_proc;          /* owner of this structure */
        short   un_cnt;                 /* # of active entries */
        struct undo {
        struct  proc *un_proc;          /* owner of this structure */
        short   un_cnt;                 /* # of active entries */
        struct undo {


@@ -150,6 +182,15 @@ struct seminfo {
 };
 extern struct seminfo  seminfo;
 
 };
 extern struct seminfo  seminfo;
 

+/*
+ * Kernel wrapper for the user-level structure
+ */
+struct semid_kernel {
+       struct  user_semid_ds u;
+       struct  label *label;   /* MAC framework label */
+};
+
+

 /* internal "mode" bits */
 #define        SEM_ALLOC       01000   /* semaphore is allocated */
 #define        SEM_DEST        02000   /* semaphore will be destroyed on last detach */
 /* internal "mode" bits */
 #define        SEM_ALLOC       01000   /* semaphore is allocated */
 #define        SEM_DEST        02000   /* semaphore will be destroyed on last detach */


@@ -176,7 +217,7 @@ extern struct seminfo       seminfo;
  */
 #define SEMUSZ         sizeof(struct sem_undo)
 
  */
 #define SEMUSZ         sizeof(struct sem_undo)
 

-extern struct user_semid_ds    *sema;          /* semaphore id pool */
+extern struct semid_kernel     *sema;          /* semaphore id pool */

 extern struct sem              *sem_pool;      /* semaphore pool */
 /* This is now a struct sem_undo with the new memory allocation 
  * extern int  *semu;          // undo structure pool
 extern struct sem              *sem_pool;      /* semaphore pool */
 /* This is now a struct sem_undo with the new memory allocation 
  * extern int  *semu;          // undo structure pool