xnu-517.tar.gz

[apple/xnu.git] / osfmk / ipc / ipc_port.c

diff --git a/osfmk/ipc/ipc_port.c b/osfmk/ipc/ipc_port.c
index a2e3001883d6e3758de115ae1ad8a19a33f8758a..bddaecf3da5caa5f43c01798b6c1c5a048767eb2 100644 (file)
--- a/osfmk/ipc/ipc_port.c
+++ b/osfmk/ipc/ipc_port.c
@@ -501,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;
 
@@ -540,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;
@@ -618,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 */
@@ -1159,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);
 
        /*