X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/8f6c56a50524aa785f7e596d52dddfb331e18961..7ddcb079202367355dddccdfa4318e57d50318be:/bsd/sys/shm_internal.h

diff --git a/bsd/sys/shm_internal.h b/bsd/sys/shm_internal.h
index 799cb9604..86a785e97 100644
--- a/bsd/sys/shm_internal.h
+++ b/bsd/sys/shm_internal.h
@@ -56,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"
@@ -70,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 */
@@ -80,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;