xnu-792.21.3.tar.gz

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

diff --git a/osfmk/ipc/mach_port.c b/osfmk/ipc/mach_port.c
index 4e1e6f488b2738ea0397b29ba82f5b62629d609a..62a34671be29d4fcdb51a6a21377efacb4534036 100644 (file)
--- a/osfmk/ipc/mach_port.c
+++ b/osfmk/ipc/mach_port.c
@@ -1,14 +1,19 @@
 /*
  * Copyright (c) 2000-2004 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@
@@ -624,12 +629,16 @@ mach_port_allocate_full(
        }
 
        if (qosp->prealloc) {
-               mach_msg_size_t size = qosp->len + MAX_TRAILER_SIZE;
-               if (right != MACH_PORT_RIGHT_RECEIVE)
-                       return (KERN_INVALID_VALUE);
-               kmsg = (ipc_kmsg_t)ipc_kmsg_alloc(size);
-               if (kmsg == IKM_NULL)
-                       return (KERN_RESOURCE_SHORTAGE);
+               if (qosp->len > MACH_MSG_SIZE_MAX - MAX_TRAILER_SIZE) {
+                       return KERN_RESOURCE_SHORTAGE;
+               } else {
+                       mach_msg_size_t size = qosp->len + MAX_TRAILER_SIZE;
+                       if (right != MACH_PORT_RIGHT_RECEIVE)
+                               return (KERN_INVALID_VALUE);
+                       kmsg = (ipc_kmsg_t)ipc_kmsg_alloc(size);
+                       if (kmsg == IKM_NULL)
+                               return (KERN_RESOURCE_SHORTAGE);
+               }
        }
 
        switch (right) {