xnu-4903.270.47.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 799cb9604e2f9b5bc50525ad6afd294d4a8fb900..5a2c941c4d17d3c1e471a9ebad104296f8f6a6f8 100644 (file)
--- a/bsd/sys/shm_internal.h
+++ b/bsd/sys/shm_internal.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
  *
  * @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
  * 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


@@ -11,10 +11,10 @@
  * 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.
  * 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.
  * 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,
  * 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,


@@ -22,7 +22,7 @@
  * 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.
  * 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_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*     $NetBSD: shm.h,v 1.15 1994/06/29 06:45:17 cgd Exp $     */
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*     $NetBSD: shm.h,v 1.15 1994/06/29 06:45:17 cgd Exp $     */


@@ -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.
  */
  * (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"
 
 /*
  * As defined+described in "X/Open System Interfaces and Headers"


@@ -70,51 +76,73 @@
 
 #include <machine/types.h>
 
 
 #include <machine/types.h>
 

-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=natural
-#endif
+#pragma pack(4)

 
 struct user_shmid_ds {
 
 struct user_shmid_ds {

-       struct ipc_perm shm_perm;       /* operation permission structure */
-       user_size_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 */
-       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_addr_t     shm_internal;   /* reserved for kernel use */
+       struct ipc_perm shm_perm;       /* operation permission structure */
+       user_size_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 */
+       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 */
+};
+
+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 */

 };
 
 };
 

-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=reset
-#endif
+#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.
 
 /*
  * 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 {
  */
 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
 };
 
 #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 shminfo shminfo;

-extern struct user_shmid_ds *shmsegs;
+extern struct shmid_kernel *shmsegs;

 
 struct proc;
 
 __BEGIN_DECLS
 
 
 struct proc;
 
 __BEGIN_DECLS
 

-void   shmexit(struct proc *);
-int    shmfork(struct proc *, struct proc *);
-__private_extern__ void        shmexec(struct proc *);
+void    shmexit(struct proc *);
+int     shmfork(struct proc *, struct proc *);
+__private_extern__ void shmexec(struct proc *);

 
 __END_DECLS
 
 
 __END_DECLS