xnu-1228.0.2.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..67b42d87a4d04b41c4fad995fccabb58b2f30169 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.
  */
  * (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"


@@ -95,18 +101,32 @@ struct user_shmid_ds {
  * 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.
  * 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;
 
 
 struct proc;