]> git.saurik.com Git - apple/xnu.git/blobdiff - osfmk/ipc/ipc_right.c
xnu-3789.70.16.tar.gz
[apple/xnu.git] / osfmk / ipc / ipc_right.c
index b8feb54dc2cc826e8512b6e4d3b5c9434227271c..7a937f5bef66d0d1666847f89703dfe977b89aa5 100644 (file)
@@ -75,6 +75,7 @@
 #include <mach/port.h>
 #include <mach/message.h>
 #include <kern/assert.h>
+#include <kern/ipc_kobject.h>
 #include <kern/misc_protos.h>
 #include <ipc/port.h>
 #include <ipc/ipc_entry.h>
@@ -261,8 +262,6 @@ ipc_right_reverse(
  *             KERN_INVALID_RIGHT      Name doesn't denote port/dead rights.
  *             KERN_INVALID_ARGUMENT   Name denotes dead name, but
  *                     immediate is FALSE or notify is IP_NULL.
- *             KERN_UREFS_OVERFLOW     Name denotes dead name, but
- *                     generating immediate notif. would overflow urefs.
  *             KERN_RESOURCE_SHORTAGE  Couldn't allocate memory.
  */
 
@@ -378,7 +377,7 @@ ipc_right_request_alloc(
 
 #if IMPORTANCE_INHERITANCE
                                if (needboost == TRUE) {
-                                       if (ipc_port_importance_delta(port, 1) == FALSE)
+                                       if (ipc_port_importance_delta(port, IPID_OPTION_SENDPOSSIBLE, 1) == FALSE)
                                                ip_unlock(port);
                                } else
 #endif /* IMPORTANCE_INHERITANCE */
@@ -397,15 +396,12 @@ ipc_right_request_alloc(
 
                        assert(urefs > 0);
 
-                       if (MACH_PORT_UREFS_OVERFLOW(urefs, 1)) {
-                               is_write_unlock(space);
-                               if (port != IP_NULL)
-                                       ip_release(port);
-                               return KERN_UREFS_OVERFLOW;
-                       }
+                       /* leave urefs pegged to maximum if it overflowed */
+                       if (urefs < MACH_PORT_UREFS_MAX)
+                               (entry->ie_bits)++; /* increment urefs */
 
-                       (entry->ie_bits)++; /* increment urefs */
                        ipc_entry_modified(space, name, entry);
+
                        is_write_unlock(space);
 
                        if (port != IP_NULL)
@@ -416,15 +412,15 @@ ipc_right_request_alloc(
                        break;
                }
 
+               kr = (entry->ie_bits & MACH_PORT_TYPE_PORT_OR_DEAD) ?
+                   KERN_INVALID_ARGUMENT : KERN_INVALID_RIGHT;
+
                is_write_unlock(space);
 
                if (port != IP_NULL)
                        ip_release(port);
 
-               if (entry->ie_bits & MACH_PORT_TYPE_PORT_OR_DEAD)
-                       return KERN_INVALID_ARGUMENT;
-               else
-                       return KERN_INVALID_RIGHT;
+               return kr;
        }
 
        *previousp = previous;
@@ -563,8 +559,9 @@ ipc_right_check(
         */
        if (entry->ie_request != IE_REQ_NONE) {
                if (ipc_port_request_type(port, name, entry->ie_request) != 0) {
-                       assert(IE_BITS_UREFS(bits) < MACH_PORT_UREFS_MAX);
-                       bits++; 
+                       /* if urefs are pegged due to overflow, leave them pegged */
+                       if (IE_BITS_UREFS(bits) < MACH_PORT_UREFS_MAX)
+                               bits++; /* increment urefs */
                }
                entry->ie_request = IE_REQ_NONE; 
        }
@@ -662,8 +659,7 @@ ipc_right_terminate(
                        assert(port->ip_receiver_name == name);
                        assert(port->ip_receiver == space);
 
-                       ipc_port_clear_receiver(port);
-                       ipc_port_destroy(port); /* consumes our ref, unlocks */
+                       ipc_port_destroy(port); /* clears receiver, consumes our ref, unlocks */
 
                } else if (type & MACH_PORT_TYPE_SEND_ONCE) {
                        assert(port->ip_sorights > 0);
@@ -807,8 +803,7 @@ ipc_right_destroy(
                        assert(ip_active(port));
                        assert(port->ip_receiver == space);
 
-                       ipc_port_clear_receiver(port);
-                       ipc_port_destroy(port); /* consumes our ref, unlocks */
+                       ipc_port_destroy(port); /* clears receiver, consumes our ref, unlocks */
 
                } else if (type & MACH_PORT_TYPE_SEND_ONCE) {
                        assert(port->ip_sorights > 0);
@@ -880,7 +875,9 @@ ipc_right_dealloc(
                if (IE_BITS_UREFS(bits) == 1) {
                        ipc_entry_dealloc(space, name, entry);
                } else {
-                       entry->ie_bits = bits-1; /* decrement urefs */
+                       /* if urefs are pegged due to overflow, leave them pegged */
+                       if (IE_BITS_UREFS(bits) < MACH_PORT_UREFS_MAX)
+                               entry->ie_bits = bits-1; /* decrement urefs */
                        ipc_entry_modified(space, name, entry);
                }
                is_write_unlock(space);
@@ -965,12 +962,13 @@ ipc_right_dealloc(
                        ip_release(port);
 
                } else {
-                       ip_unlock(port);                        
-                       entry->ie_bits = bits-1; /* decrement urefs */
+                       ip_unlock(port);
+                       /* if urefs are pegged due to overflow, leave them pegged */
+                       if (IE_BITS_UREFS(bits) < MACH_PORT_UREFS_MAX)
+                               entry->ie_bits = bits-1; /* decrement urefs */
                        ipc_entry_modified(space, name, entry);
                        is_write_unlock(space);
                }
-               
 
                if (nsrequest != IP_NULL)
                        ipc_notify_no_senders(nsrequest, mscount);
@@ -1006,9 +1004,12 @@ ipc_right_dealloc(
 
                        entry->ie_bits = bits &~ (IE_BITS_UREFS_MASK |
                                                  MACH_PORT_TYPE_SEND);
-               } else
-                       entry->ie_bits = bits-1; /* decrement urefs */
-
+               } else {
+                       /* if urefs are pegged due to overflow, leave them pegged */
+                       if (IE_BITS_UREFS(bits) < MACH_PORT_UREFS_MAX) {
+                               entry->ie_bits = bits-1; /* decrement urefs */
+                       }
+               }
                ip_unlock(port);
 
                ipc_entry_modified(space, name, entry);
@@ -1039,7 +1040,6 @@ ipc_right_dealloc(
  *             KERN_SUCCESS            Count was modified.
  *             KERN_INVALID_RIGHT      Entry has wrong type.
  *             KERN_INVALID_VALUE      Bad delta for the right.
- *             KERN_UREFS_OVERFLOW     OK delta, except would overflow.
  */
 
 kern_return_t
@@ -1140,7 +1140,6 @@ ipc_right_delta(
                        assert(IE_BITS_TYPE(bits) ==
                                        MACH_PORT_TYPE_SEND_RECEIVE);
                        assert(IE_BITS_UREFS(bits) > 0);
-                       assert(IE_BITS_UREFS(bits) < MACH_PORT_UREFS_MAX);
                        assert(port->ip_srights > 0);
 
                        if (port->ip_pdrequest != NULL) {
@@ -1171,7 +1170,9 @@ ipc_right_delta(
                                bits |= MACH_PORT_TYPE_DEAD_NAME;
                                if (entry->ie_request) {
                                        entry->ie_request = IE_REQ_NONE;
-                                       bits++;
+                                       /* if urefs are pegged due to overflow, leave them pegged */
+                                       if (IE_BITS_UREFS(bits) < MACH_PORT_UREFS_MAX)
+                                               bits++; /* increment urefs */
                                }
                                entry->ie_bits = bits;
                                entry->ie_object = IO_NULL;
@@ -1188,8 +1189,7 @@ ipc_right_delta(
                }
                is_write_unlock(space);
 
-               ipc_port_clear_receiver(port);
-               ipc_port_destroy(port); /* consumes ref, unlocks */
+               ipc_port_destroy(port); /* clears receiver, consumes ref, unlocks */
 
                if (request != IP_NULL)
                        ipc_notify_port_deleted(request, name);
@@ -1259,26 +1259,46 @@ ipc_right_delta(
                        bits = entry->ie_bits;
                        relport = port;
                        port = IP_NULL;
-               } else if ((bits & MACH_PORT_TYPE_DEAD_NAME) == 0)
+               } else if ((bits & MACH_PORT_TYPE_DEAD_NAME) == 0) {
                        goto invalid_right;
+               }
 
                assert(IE_BITS_TYPE(bits) == MACH_PORT_TYPE_DEAD_NAME);
                assert(IE_BITS_UREFS(bits) > 0);
                assert(entry->ie_object == IO_NULL);
                assert(entry->ie_request == IE_REQ_NONE);
 
-               urefs = IE_BITS_UREFS(bits);
-               if (MACH_PORT_UREFS_UNDERFLOW(urefs, delta))
+               if (delta >   ((mach_port_delta_t)MACH_PORT_UREFS_MAX) ||
+                   delta < (-((mach_port_delta_t)MACH_PORT_UREFS_MAX))) {
                        goto invalid_value;
-               if (MACH_PORT_UREFS_OVERFLOW(urefs, delta))
-                       goto urefs_overflow;
+               }
+
+               urefs = IE_BITS_UREFS(bits);
+
+               if (urefs == MACH_PORT_UREFS_MAX) {
+                       /*
+                        * urefs are pegged due to an overflow
+                        * only a delta removing all refs at once can change it
+                        */
+
+                       if (delta != (-((mach_port_delta_t)MACH_PORT_UREFS_MAX)))
+                               delta = 0;
+               } else {
+                       if (MACH_PORT_UREFS_UNDERFLOW(urefs, delta))
+                               goto invalid_value;
+                       if (MACH_PORT_UREFS_OVERFLOW(urefs, delta)) {
+                               /* leave urefs pegged to maximum if it overflowed */
+                               delta = MACH_PORT_UREFS_MAX - urefs;
+                       }
+               }
 
                if ((urefs + delta) == 0) {
                        ipc_entry_dealloc(space, name, entry);
-               } else {
+               } else if (delta != 0) {
                        entry->ie_bits = bits + delta;
                        ipc_entry_modified(space, name, entry);
                }
+
                is_write_unlock(space);
 
                if (relport != IP_NULL)
@@ -1291,12 +1311,13 @@ ipc_right_delta(
                mach_port_urefs_t urefs;
                ipc_port_t request = IP_NULL;
                ipc_port_t nsrequest = IP_NULL;
+               ipc_port_t port_to_release = IP_NULL;
                mach_port_mscount_t mscount = 0;
 
                if ((bits & MACH_PORT_TYPE_SEND) == 0)
                        goto invalid_right;
 
-               /* maximum urefs for send is MACH_PORT_UREFS_MAX-1 */
+               /* maximum urefs for send is MACH_PORT_UREFS_MAX */
 
                port = (ipc_port_t) entry->ie_object;
                assert(port != IP_NULL);
@@ -1309,14 +1330,31 @@ ipc_right_delta(
 
                assert(port->ip_srights > 0);
 
-               urefs = IE_BITS_UREFS(bits);
-               if (MACH_PORT_UREFS_UNDERFLOW(urefs, delta)) {
+               if (delta >   ((mach_port_delta_t)MACH_PORT_UREFS_MAX) ||
+                   delta < (-((mach_port_delta_t)MACH_PORT_UREFS_MAX))) {
                        ip_unlock(port);
                        goto invalid_value;
                }
-               if (MACH_PORT_UREFS_OVERFLOW(urefs+1, delta)) {
-                       ip_unlock(port);
-                       goto urefs_overflow;
+
+               urefs = IE_BITS_UREFS(bits);
+
+               if (urefs == MACH_PORT_UREFS_MAX) {
+                       /*
+                        * urefs are pegged due to an overflow
+                        * only a delta removing all refs at once can change it
+                        */
+
+                       if (delta != (-((mach_port_delta_t)MACH_PORT_UREFS_MAX)))
+                               delta = 0;
+               } else {
+                       if (MACH_PORT_UREFS_UNDERFLOW(urefs, delta)) {
+                               ip_unlock(port);
+                               goto invalid_value;
+                       }
+                       if (MACH_PORT_UREFS_OVERFLOW(urefs, delta)) {
+                               /* leave urefs pegged to maximum if it overflowed */
+                               delta = MACH_PORT_UREFS_MAX - urefs;
+                       }
                }
 
                if ((urefs + delta) == 0) {
@@ -1331,7 +1369,7 @@ ipc_right_delta(
                        if (bits & MACH_PORT_TYPE_RECEIVE) {
                                assert(port->ip_receiver_name == name);
                                assert(port->ip_receiver == space);
-                               ip_unlock(port);                                
+                               ip_unlock(port);
                                assert(IE_BITS_TYPE(bits) ==
                                                MACH_PORT_TYPE_SEND_RECEIVE);
 
@@ -1348,19 +1386,24 @@ ipc_right_delta(
                                                name, entry);
 
                                ip_unlock(port);
-                               ip_release(port);
+                               port_to_release = port;
 
                                entry->ie_object = IO_NULL;
                                ipc_entry_dealloc(space, name, entry);
                        }
-               } else {
+               } else if (delta != 0) {
                        ip_unlock(port);
                        entry->ie_bits = bits + delta;
                        ipc_entry_modified(space, name, entry);
+               } else {
+                       ip_unlock(port);
                }
 
                is_write_unlock(space);
 
+               if (port_to_release != IP_NULL)
+                       ip_release(port_to_release);
+
                if (nsrequest != IP_NULL)
                        ipc_notify_no_senders(nsrequest, mscount);
 
@@ -1389,12 +1432,8 @@ ipc_right_delta(
        is_write_unlock(space);
        return KERN_INVALID_VALUE;
 
-    urefs_overflow:
-       is_write_unlock(space);
-       return KERN_UREFS_OVERFLOW;
-       
     guard_failure:
-       return KERN_INVALID_RIGHT;              
+       return KERN_INVALID_RIGHT;
 }
 
 /*
@@ -1442,7 +1481,7 @@ ipc_right_destruct(
 
        port = (ipc_port_t) entry->ie_object;
        assert(port != IP_NULL);
-       
+
        ip_lock(port);
        assert(ip_active(port));
        assert(port->ip_receiver_name == name);
@@ -1465,10 +1504,11 @@ ipc_right_destruct(
         */
 
        if (srdelta) {
-               
+
                assert(port->ip_srights > 0);
 
                urefs = IE_BITS_UREFS(bits);
+
                /*
                 * Since we made sure that srdelta is negative,
                 * the check for urefs overflow is not required.
@@ -1477,6 +1517,16 @@ ipc_right_destruct(
                        ip_unlock(port);
                        goto invalid_value;
                }
+
+               if (urefs == MACH_PORT_UREFS_MAX) {
+                       /*
+                        * urefs are pegged due to an overflow
+                        * only a delta removing all refs at once can change it
+                        */
+                       if (srdelta != (-((mach_port_delta_t)MACH_PORT_UREFS_MAX)))
+                               srdelta = 0;
+               }
+
                if ((urefs + srdelta) == 0) {
                        if (--port->ip_srights == 0) {
                                nsrequest = port->ip_nsrequest;
@@ -1501,7 +1551,7 @@ ipc_right_destruct(
        bits = entry->ie_bits;
        if (bits & MACH_PORT_TYPE_SEND) {
                assert(IE_BITS_UREFS(bits) > 0);
-               assert(IE_BITS_UREFS(bits) < MACH_PORT_UREFS_MAX);
+               assert(IE_BITS_UREFS(bits) <= MACH_PORT_UREFS_MAX);
 
                if (port->ip_pdrequest != NULL) {
                        /*
@@ -1531,7 +1581,8 @@ ipc_right_destruct(
                        bits |= MACH_PORT_TYPE_DEAD_NAME;
                        if (entry->ie_request) {
                                entry->ie_request = IE_REQ_NONE;
-                               bits++;
+                               if (IE_BITS_UREFS(bits) < MACH_PORT_UREFS_MAX)
+                                       bits++; /* increment urefs */
                        }
                        entry->ie_bits = bits;
                        entry->ie_object = IO_NULL;
@@ -1552,8 +1603,7 @@ ipc_right_destruct(
        if (nsrequest != IP_NULL)
                ipc_notify_no_senders(nsrequest, mscount);
 
-       ipc_port_clear_receiver(port);
-       ipc_port_destroy(port); /* consumes ref, unlocks */
+       ipc_port_destroy(port); /* clears receiver, consumes ref, unlocks */
 
        if (request != IP_NULL)
                ipc_notify_port_deleted(request, name);
@@ -1669,6 +1719,8 @@ ipc_right_copyin_check(
            case MACH_MSG_TYPE_MOVE_RECEIVE:
                if ((bits & MACH_PORT_TYPE_RECEIVE) == 0)
                        return FALSE;
+               if (io_kotype(entry->ie_object) != IKOT_NONE)
+                       return FALSE;
                break;
 
            case MACH_MSG_TYPE_COPY_SEND:
@@ -1808,6 +1860,23 @@ ipc_right_copyin(
                if ((bits & MACH_PORT_TYPE_RECEIVE) == 0)
                        goto invalid_right;
 
+               /*
+                * Disallow moving receive-right kobjects, e.g. mk_timer ports
+                * The ipc_port structure uses the kdata union of kobject and
+                * imp_task exclusively. Thus, general use of a kobject port as
+                * a receive right can cause type confusion in the importance
+                * code.
+                */
+               if (io_kotype(entry->ie_object) != IKOT_NONE) {
+                       /*
+                        * Distinguish an invalid right, e.g., trying to move
+                        * a send right as a receive right, from this
+                        * situation which is, "This is a valid receive right,
+                        * but it's also a kobject and you can't move it."
+                        */
+                       return KERN_INVALID_CAPABILITY;
+               }
+
                port = (ipc_port_t) entry->ie_object;
                assert(port != IP_NULL);
 
@@ -1836,7 +1905,7 @@ ipc_right_copyin(
                entry->ie_bits = bits &~ MACH_PORT_TYPE_RECEIVE;
                ipc_entry_modified(space, name, entry);
 
-               ipc_port_clear_receiver(port);
+               (void)ipc_port_clear_receiver(port, FALSE); /* don't destroy the port/mqueue */
                port->ip_receiver_name = MACH_PORT_NULL;
                port->ip_destination = IP_NULL;
 
@@ -1957,14 +2026,18 @@ ipc_right_copyin(
                                ipc_hash_delete(space, (ipc_object_t) port,
                                                name, entry);
                                entry->ie_object = IO_NULL;
+                               /* transfer entry's reference to caller */
                        }
                        entry->ie_bits = bits &~
                                (IE_BITS_UREFS_MASK|MACH_PORT_TYPE_SEND);
                } else {
                        port->ip_srights++;
                        ip_reference(port);
-                       entry->ie_bits = bits-1; /* decrement urefs */
+                       /* if urefs are pegged due to overflow, leave them pegged */
+                       if (IE_BITS_UREFS(bits) < MACH_PORT_UREFS_MAX)
+                               entry->ie_bits = bits-1; /* decrement urefs */
                }
+
                ipc_entry_modified(space, name, entry);
                ip_unlock(port);
 
@@ -2052,7 +2125,10 @@ ipc_right_copyin(
        if (IE_BITS_UREFS(bits) == 1) {
                bits &= ~MACH_PORT_TYPE_DEAD_NAME;
        }
-       entry->ie_bits = bits-1; /* decrement urefs */
+       /* if urefs are pegged due to overflow, leave them pegged */
+       if (IE_BITS_UREFS(bits) < MACH_PORT_UREFS_MAX)
+               entry->ie_bits = bits-1; /* decrement urefs */
+
        ipc_entry_modified(space, name, entry);
        *objectp = IO_DEAD;
        *sorightp = IP_NULL;
@@ -2109,8 +2185,10 @@ ipc_right_copyin_undo(
                assert(IE_BITS_UREFS(bits) > 0);
 
                if (msgt_name != MACH_MSG_TYPE_COPY_SEND) {
-                       assert(IE_BITS_UREFS(bits) < MACH_PORT_UREFS_MAX);
-                       entry->ie_bits = bits+1; /* increment urefs */
+                       assert(IE_BITS_UREFS(bits) <= MACH_PORT_UREFS_MAX);
+                       /* if urefs are pegged due to overflow, leave them pegged */
+                       if (IE_BITS_UREFS(bits) < MACH_PORT_UREFS_MAX)
+                               entry->ie_bits = bits+1; /* increment urefs */
                }
        } else {
                assert((msgt_name == MACH_MSG_TYPE_MOVE_SEND) ||
@@ -2121,8 +2199,10 @@ ipc_right_copyin_undo(
                assert(IE_BITS_UREFS(bits) > 0);
 
                if (msgt_name != MACH_MSG_TYPE_COPY_SEND) {
-                       assert(IE_BITS_UREFS(bits) < MACH_PORT_UREFS_MAX-1);
-                       entry->ie_bits = bits+1; /* increment urefs */
+                       assert(IE_BITS_UREFS(bits) <= MACH_PORT_UREFS_MAX);
+                       /* if urefs are pegged due to overflow, leave them pegged */
+                       if (IE_BITS_UREFS(bits) < MACH_PORT_UREFS_MAX)
+                               entry->ie_bits = bits+1; /* increment urefs */
                }
 
                /*
@@ -2220,7 +2300,9 @@ ipc_right_copyin_two_move_sends(
                port->ip_srights += 2;
                ip_reference(port);
                ip_reference(port);
-               entry->ie_bits = bits-2; /* decrement urefs */
+               /* if urefs are pegged due to overflow, leave them pegged */
+               if (IE_BITS_UREFS(bits) < MACH_PORT_UREFS_MAX)
+                       entry->ie_bits = bits-2; /* decrement urefs */
        }
        ipc_entry_modified(space, name, entry);
 
@@ -2405,9 +2487,6 @@ ipc_right_copyin_two(
  *             The object is unlocked; the space isn't.
  *     Returns:
  *             KERN_SUCCESS            Copied out capability.
- *             KERN_UREFS_OVERFLOW     User-refs would overflow;
- *                     guaranteed not to happen with a fresh entry
- *                     or if overflow=TRUE was specified.
  */
 
 kern_return_t
@@ -2416,7 +2495,7 @@ ipc_right_copyout(
        mach_port_name_t        name,
        ipc_entry_t             entry,
        mach_msg_type_name_t    msgt_name,
-       boolean_t               overflow,
+       __unused boolean_t      overflow,
        ipc_object_t            object)
 {
        ipc_entry_bits_t bits;
@@ -2433,14 +2512,15 @@ ipc_right_copyout(
 
        switch (msgt_name) {
            case MACH_MSG_TYPE_PORT_SEND_ONCE:
-               
+
                assert(IE_BITS_TYPE(bits) == MACH_PORT_TYPE_NONE);
+               assert(IE_BITS_UREFS(bits) == 0);
                assert(port->ip_sorights > 0);
 
                /* transfer send-once right and ref to entry */
                ip_unlock(port);
 
-               entry->ie_bits = bits | (MACH_PORT_TYPE_SEND_ONCE | 1);
+               entry->ie_bits = bits | (MACH_PORT_TYPE_SEND_ONCE | 1); /* set urefs to 1 */
                ipc_entry_modified(space, name, entry);
                break;
 
@@ -2452,33 +2532,33 @@ ipc_right_copyout(
 
                        assert(port->ip_srights > 1);
                        assert(urefs > 0);
-                       assert(urefs < MACH_PORT_UREFS_MAX);
+                       assert(urefs <= MACH_PORT_UREFS_MAX);
 
-                       if (urefs+1 == MACH_PORT_UREFS_MAX) {
-                               if (overflow) {
-                                       /* leave urefs pegged to maximum */
-
-                                       port->ip_srights--;
-                                       ip_unlock(port);
-                                       ip_release(port);
-                                       return KERN_SUCCESS;
-                               }
+                       if (urefs == MACH_PORT_UREFS_MAX) {
+                               /*
+                                * leave urefs pegged to maximum,
+                                * consume send right and ref
+                                */
 
+                               port->ip_srights--;
                                ip_unlock(port);
-                               return KERN_UREFS_OVERFLOW;
+                               ip_release(port);
+                               return KERN_SUCCESS;
                        }
+
+                       /* consume send right and ref */
                        port->ip_srights--;
                        ip_unlock(port);
                        ip_release(port);
-                       
+
                } else if (bits & MACH_PORT_TYPE_RECEIVE) {
                        assert(IE_BITS_TYPE(bits) == MACH_PORT_TYPE_RECEIVE);
                        assert(IE_BITS_UREFS(bits) == 0);
 
-                       /* transfer send right to entry */
+                       /* transfer send right to entry, consume ref */
                        ip_unlock(port);
                        ip_release(port);
-                       
+
                } else {
                        assert(IE_BITS_TYPE(bits) == MACH_PORT_TYPE_NONE);
                        assert(IE_BITS_UREFS(bits) == 0);
@@ -2492,7 +2572,7 @@ ipc_right_copyout(
                                        name, entry);
                }
 
-               entry->ie_bits = (bits | MACH_PORT_TYPE_SEND) + 1;
+               entry->ie_bits = (bits | MACH_PORT_TYPE_SEND) + 1; /* increment urefs */
                ipc_entry_modified(space, name, entry);
                break;
 
@@ -2663,9 +2743,7 @@ ipc_right_rename(
 
                ips_lock(pset);
                assert(ips_active(pset));
-               assert(pset->ips_local_name == oname);
 
-               pset->ips_local_name = nname;
                ips_unlock(pset);
                break;
            }