X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/9bccf70c0258c7cac2dcb80011b2a964d884c552..55e303ae13a4cf49d70f2294092726f2fffb9ef2:/osfmk/ipc/ipc_port.c

diff --git a/osfmk/ipc/ipc_port.c b/osfmk/ipc/ipc_port.c
index 9bb7ed781..bddaecf3d 100644
--- a/osfmk/ipc/ipc_port.c
+++ b/osfmk/ipc/ipc_port.c
@@ -3,19 +3,22 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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.
+ * 
+ * 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,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE 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_LICENSE_HEADER_END@
  */
@@ -498,6 +501,10 @@ ipc_port_alloc(
 
 	ipc_port_init(port, space, name);
 
+	if (task_is_classic(current_task())) {
+		IP_SET_CLASSIC(port);
+	}
+
 	*namep = name;
 	*portp = port;
 
@@ -537,6 +544,10 @@ ipc_port_alloc_name(
 
 	ipc_port_init(port, space, name);
 
+	if (task_is_classic(current_task())) {
+		IP_SET_CLASSIC(port);
+	}
+
 	*portp = port;
 
 	return KERN_SUCCESS;
@@ -615,24 +626,9 @@ ipc_port_destroy(
 		port->ip_destination = IP_NULL;
 		ip_unlock(port);
 
-		if (!ipc_port_check_circularity(port, pdrequest)) {
-			/* consumes our refs for port and pdrequest */
-			ipc_notify_port_destroyed(pdrequest, port);
-			return;
-		} else {
-			/* consume pdrequest and destroy port */
-			ipc_port_release_sonce(pdrequest);
-		}
-
-		ip_lock(port);
-		assert(ip_active(port));
-		assert(port->ip_pset_count == 0);
-		assert(port->ip_mscount == 0);
-		assert(port->ip_pdrequest == IP_NULL);
-		assert(port->ip_receiver_name == MACH_PORT_NULL);
-		assert(port->ip_destination == IP_NULL);
-
-		/* fall through and destroy the port */
+		/* consumes our refs for port and pdrequest */
+		ipc_notify_port_destroyed(pdrequest, port);
+		return;
 	}
 
 	/* once port is dead, we don't need to keep it locked */
@@ -1156,7 +1152,7 @@ ipc_port_dealloc_special(
 {
 	ip_lock(port);
 	assert(ip_active(port));
-	assert(port->ip_receiver_name != MACH_PORT_NULL);
+//	assert(port->ip_receiver_name != MACH_PORT_NULL);
 	assert(port->ip_receiver == space);
 
 	/*