xnu-2422.90.20.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 98dd9f8b91211bfa2d9b0df677597056cf2ef4d5..86a785e977135d00e034cb0ebef00df9acf68cca 100644 (file)
--- 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,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
@@ -107,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;