--- xnu/xnu-201.19.3/libkern/c++/OSSerialize.cpp
+++ xnu/xnu-792.21.3/libkern/c++/OSSerialize.cpp
@@ -1,25 +1,37 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @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.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * @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. 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
  * 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.
- * 
- * @APPLE_LICENSE_HEADER_END@
+ * 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_OSREFERENCE_LICENSE_HEADER_END@
  */
 /* OSSerialize.cpp created by rsulack on Wen 25-Nov-1998 */
+
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+#include <vm/vm_kern.h>
+__END_DECLS
 
 #include <libkern/c++/OSContainers.h>
 #include <libkern/c++/OSLib.h>
@@ -142,13 +154,14 @@
 
     tag = 0;
     length = 1;
-    capacity = inCapacity;
-    capacityIncrement = (capacity)? capacity : 256;
-
-    capacity = (((capacity - 1) / capacityIncrement) + 1)
-             * capacityIncrement;
-    data = (char *) kalloc(capacity);
-    if (!data) {
+    capacity = (inCapacity) ? round_page_32(inCapacity) : round_page_32(1);
+    capacityIncrement = capacity;
+
+    // allocate from the kernel map so that we can safely map this data
+    // into user space (the primary use of the OSSerialize object)
+    
+    kern_return_t rc = kmem_alloc(kernel_map, (vm_offset_t *)&data, capacity);
+    if (rc) {
         tags->release();
         tags = 0;
         return false;
@@ -166,7 +179,7 @@
 	OSSerialize *me = new OSSerialize;
 
 	if (me && !me->initWithCapacity(inCapacity)) {
-		me->free();
+		me->release();
 		return 0;
 	}
 
@@ -185,25 +198,31 @@
 unsigned int OSSerialize::ensureCapacity(unsigned int newCapacity)
 {
 	char *newData;
-	unsigned int oldCapacity;
 
 	if (newCapacity <= capacity)
 		return capacity;
 
 	// round up
-	newCapacity = (((newCapacity - 1) / capacityIncrement) + 1)
-                * capacityIncrement;
-	newData = (char *) kalloc(newCapacity);
-	if (newData) {
-		oldCapacity = capacity;
-
-		ACCUMSIZE(newCapacity - oldCapacity);
-
-		bcopy(data, newData, oldCapacity);
-		bzero(&newData[capacity], newCapacity - oldCapacity);
-		kfree((vm_offset_t)data, oldCapacity);
-		data = newData;
-		capacity = newCapacity;
+	newCapacity = round_page_32(newCapacity);
+
+	kern_return_t rc = kmem_realloc(kernel_map,
+					(vm_offset_t)data,
+					capacity,
+					(vm_offset_t *)&newData,
+					newCapacity);
+	if (!rc) {
+	    ACCUMSIZE(newCapacity);
+
+	    // kmem realloc does not free the old address range
+	    kmem_free(kernel_map, (vm_offset_t)data, capacity); 
+	    ACCUMSIZE(-capacity);
+	    
+	    // kmem realloc does not zero out the new memory
+	    // and this could end up going to user land
+	    bzero(&newData[capacity], newCapacity - capacity);
+		
+	    data = newData;
+	    capacity = newCapacity;
 	}
 
 	return capacity;
@@ -215,7 +234,7 @@
         tags->release();
 
     if (data) {
-        kfree((vm_offset_t)data, capacity);
+	kmem_free(kernel_map, (vm_offset_t)data, capacity); 
         ACCUMSIZE( -capacity );
     }
     super::free();
@@ -225,7 +244,7 @@
 OSDefineMetaClassAndStructors(OSSerializer, OSObject)
 
 OSSerializer * OSSerializer::forTarget( void * target,
-                               OSSerializerCallback callback, void * ref = 0 )
+                               OSSerializerCallback callback, void * ref )
 {
     OSSerializer * thing;