xnu-3247.1.106.tar.gz

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

diff --git a/bsd/sys/shm_internal.h b/bsd/sys/shm_internal.h
index bea5c0cfebb00a50083d7d1fd9ae5a6ea7725cef..86a785e977135d00e034cb0ebef00df9acf68cca 100644 (file)
--- a/bsd/sys/shm_internal.h
+++ b/bsd/sys/shm_internal.h
@@ -1,31 +1,29 @@
 /*
  * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_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.
- *
- * 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 
+ * 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
  * limitations under the License.
- *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*     $NetBSD: shm.h,v 1.15 1994/06/29 06:45:17 cgd Exp $     */
 
@@ -58,6 +56,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+/*
+ * 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.
+ */
 
 /*
  * As defined+described in "X/Open System Interfaces and Headers"
@@ -72,9 +76,7 @@
 
 #include <machine/types.h>
 
-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=natural
-#endif
+#pragma pack(4)
 
 struct user_shmid_ds {
        struct ipc_perm shm_perm;       /* operation permission structure */
@@ -82,15 +84,25 @@ struct user_shmid_ds {
        pid_t           shm_lpid;       /* PID of last shared memory op */
        pid_t           shm_cpid;       /* PID of creator */
        short           shm_nattch;     /* number of current attaches */
-       time_t          shm_atime;      /* time of last shmat() */
-       time_t          shm_dtime;      /* time of last shmdt() */
-       time_t          shm_ctime;      /* time of last change by shmctl() */
+       user_time_t     shm_atime;      /* time of last shmat() */
+       user_time_t     shm_dtime;      /* time of last shmdt() */
+       user_time_t     shm_ctime;      /* time of last change by shmctl() */
        user_addr_t     shm_internal;   /* reserved for kernel use */
 };
 
-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=reset
-#endif
+struct user32_shmid_ds {
+       struct ipc_perm shm_perm;       /* operation permission structure */
+       uint32_t        shm_segsz;      /* size of segment in bytes */
+       pid_t           shm_lpid;       /* PID of last shared memory op */
+       pid_t           shm_cpid;       /* PID of creator */
+       short           shm_nattch;     /* number of current attaches */
+       uint32_t                shm_atime;      /* time of last shmat() */
+       uint32_t                shm_dtime;      /* time of last shmdt() */
+       uint32_t                shm_ctime;      /* time of last change by shmctl() */
+       user32_addr_t   shm_internal;   /* reserved for kernel use */
+};
+
+#pragma pack()
 
 /*
  * System 5 style catch-all structure for shared memory constants that
@@ -109,8 +121,20 @@ struct shminfo {
 };
 
 #ifdef KERNEL
+
+struct label;
+
+/* 
+ * Add a kernel wrapper to the shmid_ds struct so that private info (like the
+ * MAC label) can be added to it, without changing the user interface.
+ */
+struct shmid_kernel {
+       struct user_shmid_ds u;
+       struct label *label;    /* MAC label */
+};
+
 extern struct shminfo shminfo;
-extern struct user_shmid_ds *shmsegs;
+extern struct shmid_kernel *shmsegs;
 
 struct proc;