X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/6601e61aa18bf4f09af135ff61fc7f4771d23b06..d190cdc3f5544636abb56dc1874be391d3e1b148:/bsd/sys/shm_internal.h

diff --git a/bsd/sys/shm_internal.h b/bsd/sys/shm_internal.h
index e0bd76189..86a785e97 100644
--- a/bsd/sys/shm_internal.h
+++ b/bsd/sys/shm_internal.h
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * 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 Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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 OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * 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_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*	$NetBSD: shm.h,v 1.15 1994/06/29 06:45:17 cgd Exp $	*/
 
@@ -50,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"
@@ -64,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 */
@@ -74,33 +84,57 @@ 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
  * might be of interest to user programs.  Also part of the ipcs interface.
  * Note: use of user_ssize_t intentional: permits 32 bit ipcs to provide
  * information about 64 bit programs shared segments.
+ * Note 2: user_ssize_t is not that useful if it's not 64-bit,
+ * so let's use int64_t explicitely...
  */
 struct shminfo {
-	user_ssize_t	shmmax;		/* max shm segment size (bytes) */
-	user_ssize_t	shmmin;		/* min shm segment size (bytes) */
-	user_ssize_t	shmmni;		/* max number of shm identifiers */
-	user_ssize_t	shmseg;		/* max shm segments per process */
-	user_ssize_t	shmall;		/* max amount of shm (pages) */
+	int64_t	shmmax;		/* max shm segment size (bytes) */
+	int64_t	shmmin;		/* min shm segment size (bytes) */
+	int64_t	shmmni;		/* max number of shm identifiers */
+	int64_t	shmseg;		/* max shm segments per process */
+	int64_t	shmall;		/* max amount of shm (pages) */
 };
 
 #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;