xnu-1228.15.4.tar.gz

[apple/xnu.git] / osfmk / ipc / ipc_space.h

diff --git a/osfmk/ipc/ipc_space.h b/osfmk/ipc/ipc_space.h
index 864edc0b3d1fe119902b8a9db39d5cdcc24767e3..792fe68940777e493a225781ccb55acf65490a9e 100644 (file)
--- a/osfmk/ipc/ipc_space.h
+++ b/osfmk/ipc/ipc_space.h
@@ -1,16 +1,19 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 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
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * 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.
+ * 
+ * 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
@@ -20,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
@@ -50,6 +53,12 @@
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
+/*
+ * NOTICE: This file was modified by McAfee Research in 2004 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.
+ */
 /*
  */
 /*
@@ -72,7 +81,7 @@
 #include <sys/appleapiopts.h>
 
 #ifdef __APPLE_API_PRIVATE
-#ifdef MACH_KERNEL_PRIVATE
+#if MACH_KERNEL_PRIVATE
 #include <mach_kdb.h>
 #include <kern/macro_help.h>
 #include <kern/kern_types.h>
@@ -116,6 +125,8 @@ struct ipc_space {
        ipc_entry_num_t is_tree_small;  /* # of small entries in the tree */
        ipc_entry_num_t is_tree_hash;   /* # of hashed entries in the tree */
        boolean_t is_fast;              /* for is_fast_space() */
+
+       task_t is_task;                 /* associated task */
 };
 
 #define        IS_NULL                 ((ipc_space_t) 0)
@@ -123,7 +134,7 @@ struct ipc_space {
 extern zone_t ipc_space_zone;
 
 #define is_alloc()             ((ipc_space_t) zalloc(ipc_space_zone))
-#define        is_free(is)             zfree(ipc_space_zone, (vm_offset_t) (is))
+#define        is_free(is)             zfree(ipc_space_zone, (is))
 
 extern ipc_space_t ipc_space_kernel;
 extern ipc_space_t ipc_space_reply;
@@ -136,8 +147,7 @@ extern ipc_space_t default_pager_space;
 
 #define is_fast_space(is)      ((is)->is_fast)
 
-#define        is_ref_lock_init(is)    mutex_init(&(is)->is_ref_lock_data, \
-                                          ETAP_IPC_IS_REF)
+#define        is_ref_lock_init(is)    mutex_init(&(is)->is_ref_lock_data, 0)
 
 #define        ipc_space_reference_macro(is)                                   \
 MACRO_BEGIN                                                            \
@@ -160,7 +170,7 @@ MACRO_BEGIN                                                         \
                is_free(is);                                            \
 MACRO_END
 
-#define        is_lock_init(is)        mutex_init(&(is)->is_lock_data, ETAP_IPC_IS)
+#define        is_lock_init(is)        mutex_init(&(is)->is_lock_data, 0)
 
 #define        is_read_lock(is)        mutex_lock(&(is)->is_lock_data)
 #define is_read_unlock(is)     mutex_unlock(&(is)->is_lock_data)
@@ -196,6 +206,10 @@ extern kern_return_t ipc_space_create(
 extern void ipc_space_destroy(
        ipc_space_t     space);
 
+/* Clean up the entries - but leave the space alive */
+extern void ipc_space_clean(
+       ipc_space_t     space);
+
 #endif /* MACH_KERNEL_PRIVATE */
 #endif /* __APPLE_API_PRIVATE */