xnu-1486.2.11.tar.gz

[apple/xnu.git] / osfmk / kern / ipc_sync.c

diff --git a/osfmk/kern/ipc_sync.c b/osfmk/kern/ipc_sync.c
index 148bc68960f9ee2c16f28ba809821032e0ad6905..ab24fe06f263a44eb220b066c7b64ad262d768c2 100644 (file)
--- a/osfmk/kern/ipc_sync.c
+++ b/osfmk/kern/ipc_sync.c
@@ -1,14 +1,19 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @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
@@ -18,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@
@@ -99,11 +104,12 @@ convert_semaphore_to_port (semaphore_t semaphore)
 {
        ipc_port_t port;
 
-       if (semaphore != SEMAPHORE_NULL)
-               port = ipc_port_make_send(semaphore->port);
-       else
-               port = IP_NULL;
+       if (semaphore == SEMAPHORE_NULL)
+               return (IP_NULL);
 
+       /* caller is donating a reference */
+       port = ipc_port_make_send(semaphore->port);
+       semaphore_dereference(semaphore);
        return (port);
 }
 
@@ -129,11 +135,12 @@ convert_lock_set_to_port (lock_set_t lock_set)
 {
        ipc_port_t port;
 
-       if (lock_set != LOCK_SET_NULL)
-               port = ipc_port_make_send(lock_set->port);
-       else
-               port = IP_NULL;
+       if (lock_set == LOCK_SET_NULL)
+               return IP_NULL;
 
+       /* caller is donating a reference */
+       port = ipc_port_make_send(lock_set->port);
+       lock_set_dereference(lock_set);
        return (port);
 }