--- xnu/xnu-4570.71.2/libkern/c++/OSRuntime.cpp
+++ xnu/xnu-3248.30.4/libkern/c++/OSRuntime.cpp
@@ -87,28 +87,36 @@
 extern int debug_iomalloc_size;
 #endif
 
+struct _mhead {
+    size_t  mlen;
+    char    dat[0];
+};
+
 /*********************************************************************
 *********************************************************************/
 void *
 kern_os_malloc(size_t size)
 {
-    void *mem;
+    struct _mhead * mem;
+    size_t          memsize = sizeof (*mem) + size ;
+
     if (size == 0) {
         return (0);
     }
 
-    mem = kallocp_tag_bt((vm_size_t *)&size, VM_KERN_MEMORY_LIBKERN);
+    mem = (struct _mhead *)kalloc_tag_bt(memsize, VM_KERN_MEMORY_LIBKERN);
     if (!mem) {
         return (0);
     }
 
 #if OSALLOCDEBUG
-    OSAddAtomic(size, &debug_iomalloc_size);
-#endif
-
-    bzero(mem, size);
-
-    return mem;
+    debug_iomalloc_size += memsize;
+#endif
+
+    mem->mlen = memsize;
+    bzero(mem->dat, size);
+
+    return mem->dat;
 }
 
 /*********************************************************************
@@ -116,13 +124,24 @@
 void
 kern_os_free(void * addr)
 {
-    size_t size;
-    size = kalloc_size(addr);
+    struct _mhead * hdr;
+
+    if (!addr) {
+        return;
+    }
+
+    hdr = (struct _mhead *)addr; 
+    hdr--;
+
 #if OSALLOCDEBUG
-	OSAddAtomic(-size, &debug_iomalloc_size);
-#endif
-
-    kfree_addr(addr);
+    debug_iomalloc_size -= hdr->mlen;
+#endif
+
+#if 0
+    memset((vm_offset_t)hdr, 0xbb, hdr->mlen);
+#else
+    kfree(hdr, hdr->mlen);
+#endif
 }
 
 /*********************************************************************
@@ -132,40 +151,60 @@
     void   * addr,
     size_t   nsize)
 {
-    void            *nmem;
-    size_t          osize;
+    struct _mhead * ohdr;
+    struct _mhead * nmem;
+    size_t          nmemsize, osize;
 
     if (!addr) {
         return (kern_os_malloc(nsize));
     }
 
-    osize = kalloc_size(addr);
+    ohdr = (struct _mhead *)addr;
+    ohdr--;
+    osize = ohdr->mlen - sizeof(*ohdr);
     if (nsize == osize) {
         return (addr);
     }
 
     if (nsize == 0) {
-        kfree_addr(addr);
+        kern_os_free(addr);
         return (0);
     }
 
-    nmem = kallocp_tag_bt((vm_size_t *)&nsize, VM_KERN_MEMORY_LIBKERN);
+    nmemsize = sizeof (*nmem) + nsize ;
+    nmem = (struct _mhead *) kalloc_tag_bt(nmemsize, VM_KERN_MEMORY_LIBKERN);
     if (!nmem){
-        kfree_addr(addr);
+        kern_os_free(addr);
         return (0);
     }
 
 #if OSALLOCDEBUG
-    OSAddAtomic((nsize - osize), &debug_iomalloc_size);
-#endif
-
+    debug_iomalloc_size += (nmemsize - ohdr->mlen);
+#endif
+
+    nmem->mlen = nmemsize;
     if (nsize > osize) {
-        (void)memset((char *)nmem + osize, 0, nsize - osize);
-    }
-    (void)memcpy(nmem, addr, (nsize > osize) ? osize : nsize);
-    kfree_addr(addr);
-
-    return (nmem);
+        (void) memset(&nmem->dat[osize], 0, nsize - osize);
+    }
+    (void)memcpy(nmem->dat, ohdr->dat, (nsize > osize) ? osize : nsize);
+    kfree(ohdr, ohdr->mlen);
+
+    return (nmem->dat);
+}
+
+/*********************************************************************
+*********************************************************************/
+size_t
+kern_os_malloc_size(void * addr)
+{
+    struct _mhead * hdr;
+
+    if (!addr) {
+        return(0);
+    }
+
+    hdr = (struct _mhead *) addr; hdr--;
+    return hdr->mlen - sizeof (struct _mhead);
 }
 
 #if PRAGMA_MARK
@@ -267,7 +306,7 @@
         } /* if (strncmp...) */
     } /* for (section...) */
 
-    OSSafeReleaseNULL(theKext);
+    OSSafeRelease(theKext);
     return;
 }
 
@@ -352,7 +391,7 @@
     }
     result = KMOD_RETURN_SUCCESS;
 finish:
-    OSSafeReleaseNULL(theKext);
+    OSSafeRelease(theKext);
     return result;
 }
 
@@ -485,7 +524,7 @@
         theKext->setCPPInitialized(true);
     }
 finish:
-    OSSafeReleaseNULL(theKext);
+    OSSafeRelease(theKext);
     return result;
 }