]> git.saurik.com Git - apple/xnu.git/blobdiff - bsd/kern/ubc_subr.c
xnu-7195.101.1.tar.gz
[apple/xnu.git] / bsd / kern / ubc_subr.c
index 89e61f1a60d46e3799117e85abe1680f4847a3ae..320e71ef766264e571e5ceb482d1bf4d2136a931 100644 (file)
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 1999-2014 Apple Inc. All rights reserved.
+ * Copyright (c) 1999-2020 Apple Inc. All rights reserved.
  *
  * @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
  * 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,
  * 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@
  */
-/* 
+/*
  *     File:   ubc_subr.c
  *     Author: Umesh Vaishampayan [umeshv@apple.com]
  *             05-Aug-1999     umeshv  Created.
@@ -34,7 +34,7 @@
  *
  * Caller of UBC functions MUST have a valid reference on the vnode.
  *
- */ 
+ */
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -52,6 +52,8 @@
 #include <sys/codesign.h>
 #include <sys/codedir_internal.h>
 #include <sys/fsevents.h>
+#include <sys/fcntl.h>
+#include <sys/reboot.h>
 
 #include <mach/mach_types.h>
 #include <mach/memory_object_types.h>
 #include <kern/kalloc.h>
 #include <kern/zalloc.h>
 #include <kern/thread.h>
+#include <vm/pmap.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_protos.h> /* last */
 
 #include <libkern/crypto/sha1.h>
+#include <libkern/crypto/sha2.h>
 #include <libkern/libkern.h>
+#include <libkern/ptrauth_utils.h>
 
 #include <security/mac_framework.h>
 #include <stdbool.h>
+#include <stdatomic.h>
 
 /* XXX These should be in a BSD accessible Mach header, but aren't. */
 extern kern_return_t memory_object_pages_resident(memory_object_control_t,
-                                                       boolean_t *);
-extern kern_return_t   memory_object_signed(memory_object_control_t control,
-                                            boolean_t is_signed);
-extern boolean_t       memory_object_is_slid(memory_object_control_t   control);
-extern boolean_t       memory_object_is_signed(memory_object_control_t);
+    boolean_t *);
+extern kern_return_t    memory_object_signed(memory_object_control_t control,
+    boolean_t is_signed);
+extern boolean_t        memory_object_is_signed(memory_object_control_t);
+extern void             memory_object_mark_trusted(
+       memory_object_control_t         control);
+
+/* XXX Same for those. */
 
 extern void Debugger(const char *message);
 
 
 /* XXX no one uses this interface! */
 kern_return_t ubc_page_op_with_control(
-       memory_object_control_t  control,
-       off_t                    f_offset,
-       int                      ops,
-       ppnum_t                  *phys_entryp,
-       int                      *flagsp);
+       memory_object_control_t  control,
+       off_t                    f_offset,
+       int                      ops,
+       ppnum_t                  *phys_entryp,
+       int                      *flagsp);
 
 
 #if DIAGNOSTIC
@@ -108,8 +117,12 @@ static int ubc_umcallback(vnode_t, void *);
 static int ubc_msync_internal(vnode_t, off_t, off_t, off_t *, int, int *);
 static void ubc_cs_free(struct ubc_info *uip);
 
-struct zone    *ubc_info_zone;
-static uint32_t        cs_blob_generation_count = 1;
+static boolean_t ubc_cs_supports_multilevel_hash(struct cs_blob *blob);
+static kern_return_t ubc_cs_convert_to_multilevel_hash(struct cs_blob *blob);
+
+ZONE_DECLARE(ubc_info_zone, "ubc_info zone", sizeof(struct ubc_info),
+    ZC_NOENCRYPT | ZC_ZFREE_CLEARMEM);
+static uint32_t cs_blob_generation_count = 1;
 
 /*
  * CODESIGNING
@@ -118,10 +131,7 @@ static uint32_t    cs_blob_generation_count = 1;
 
 extern int cs_debug;
 
-#define        PAGE_SHIFT_4K           (12)
-#define        PAGE_SIZE_4K            ((1<<PAGE_SHIFT_4K))
-#define        PAGE_MASK_4K            ((PAGE_SIZE_4K-1))
-#define round_page_4K(x)       (((vm_offset_t)(x) + PAGE_MASK_4K) & ~((vm_offset_t)PAGE_MASK_4K))
+#define PAGE_SHIFT_4K           (12)
 
 static boolean_t
 cs_valid_range(
@@ -143,62 +153,108 @@ cs_valid_range(
        return TRUE;
 }
 
-/*
- * Locate the CodeDirectory from an embedded signature blob
- */
-const 
-CS_CodeDirectory *findCodeDirectory(
-       const CS_SuperBlob *embedded,
-       char *lower_bound,
-       char *upper_bound)
+typedef void (*cs_md_init)(void *ctx);
+typedef void (*cs_md_update)(void *ctx, const void *data, size_t size);
+typedef void (*cs_md_final)(void *hash, void *ctx);
+
+struct cs_hash {
+       uint8_t             cs_type;    /* type code as per code signing */
+       size_t              cs_size;    /* size of effective hash (may be truncated) */
+       size_t              cs_digest_size;/* size of native hash */
+       cs_md_init          cs_init;
+       cs_md_update        cs_update;
+       cs_md_final         cs_final;
+};
+
+uint8_t
+cs_hash_type(
+       struct cs_hash const * const cs_hash)
 {
-       const CS_CodeDirectory *cd = NULL;
-
-       if (embedded &&
-           cs_valid_range(embedded, embedded + 1, lower_bound, upper_bound) &&
-           ntohl(embedded->magic) == CSMAGIC_EMBEDDED_SIGNATURE) {
-               const CS_BlobIndex *limit;
-               const CS_BlobIndex *p;
+       return cs_hash->cs_type;
+}
 
-               limit = &embedded->index[ntohl(embedded->count)];
-               if (!cs_valid_range(&embedded->index[0], limit,
-                                   lower_bound, upper_bound)) {
-                       return NULL;
-               }
-               for (p = embedded->index; p < limit; ++p) {
-                       if (ntohl(p->type) == CSSLOT_CODEDIRECTORY) {
-                               const unsigned char *base;
+static const struct cs_hash cs_hash_sha1 = {
+       .cs_type = CS_HASHTYPE_SHA1,
+       .cs_size = CS_SHA1_LEN,
+       .cs_digest_size = SHA_DIGEST_LENGTH,
+       .cs_init = (cs_md_init)SHA1Init,
+       .cs_update = (cs_md_update)SHA1Update,
+       .cs_final = (cs_md_final)SHA1Final,
+};
+#if CRYPTO_SHA2
+static const struct cs_hash cs_hash_sha256 = {
+       .cs_type = CS_HASHTYPE_SHA256,
+       .cs_size = SHA256_DIGEST_LENGTH,
+       .cs_digest_size = SHA256_DIGEST_LENGTH,
+       .cs_init = (cs_md_init)SHA256_Init,
+       .cs_update = (cs_md_update)SHA256_Update,
+       .cs_final = (cs_md_final)SHA256_Final,
+};
+static const struct cs_hash cs_hash_sha256_truncate = {
+       .cs_type = CS_HASHTYPE_SHA256_TRUNCATED,
+       .cs_size = CS_SHA256_TRUNCATED_LEN,
+       .cs_digest_size = SHA256_DIGEST_LENGTH,
+       .cs_init = (cs_md_init)SHA256_Init,
+       .cs_update = (cs_md_update)SHA256_Update,
+       .cs_final = (cs_md_final)SHA256_Final,
+};
+static const struct cs_hash cs_hash_sha384 = {
+       .cs_type = CS_HASHTYPE_SHA384,
+       .cs_size = SHA384_DIGEST_LENGTH,
+       .cs_digest_size = SHA384_DIGEST_LENGTH,
+       .cs_init = (cs_md_init)SHA384_Init,
+       .cs_update = (cs_md_update)SHA384_Update,
+       .cs_final = (cs_md_final)SHA384_Final,
+};
+#endif
 
-                               base = (const unsigned char *)embedded;
-                               cd = (const CS_CodeDirectory *)(base + ntohl(p->offset));
-                               break;
-                       }
-               }
-       } else {
-               /*
-                * Detached signatures come as a bare CS_CodeDirectory,
-                * without a blob.
-                */
-               cd = (const CS_CodeDirectory *) embedded;
+static struct cs_hash const *
+cs_find_md(uint8_t type)
+{
+       if (type == CS_HASHTYPE_SHA1) {
+               return &cs_hash_sha1;
+#if CRYPTO_SHA2
+       } else if (type == CS_HASHTYPE_SHA256) {
+               return &cs_hash_sha256;
+       } else if (type == CS_HASHTYPE_SHA256_TRUNCATED) {
+               return &cs_hash_sha256_truncate;
+       } else if (type == CS_HASHTYPE_SHA384) {
+               return &cs_hash_sha384;
+#endif
        }
+       return NULL;
+}
 
-       if (cd &&
-           cs_valid_range(cd, cd + 1, lower_bound, upper_bound) &&
-           cs_valid_range(cd, (const char *) cd + ntohl(cd->length),
-                          lower_bound, upper_bound) &&
-           cs_valid_range(cd, (const char *) cd + ntohl(cd->hashOffset),
-                          lower_bound, upper_bound) &&
-           cs_valid_range(cd, (const char *) cd +
-                          ntohl(cd->hashOffset) +
-                          (ntohl(cd->nCodeSlots) * SHA1_RESULTLEN),
-                          lower_bound, upper_bound) &&
-           
-           ntohl(cd->magic) == CSMAGIC_CODEDIRECTORY) {
-               return cd;
-       }
+union cs_hash_union {
+       SHA1_CTX                sha1ctxt;
+       SHA256_CTX              sha256ctx;
+       SHA384_CTX              sha384ctx;
+};
 
-       // not found or not a valid code directory
-       return NULL;
+
+/*
+ * Choose among different hash algorithms.
+ * Higher is better, 0 => don't use at all.
+ */
+static const uint32_t hashPriorities[] = {
+       CS_HASHTYPE_SHA1,
+       CS_HASHTYPE_SHA256_TRUNCATED,
+       CS_HASHTYPE_SHA256,
+       CS_HASHTYPE_SHA384,
+};
+
+static unsigned int
+hash_rank(const CS_CodeDirectory *cd)
+{
+       uint32_t type = cd->hashType;
+       unsigned int n;
+
+       for (n = 0; n < sizeof(hashPriorities) / sizeof(hashPriorities[0]); ++n) {
+               if (hashPriorities[n] == type) {
+                       return n + 1;
+               }
+       }
+       return 0;       /* not supported */
 }
 
 
@@ -208,29 +264,30 @@ CS_CodeDirectory *findCodeDirectory(
 static const unsigned char *
 hashes(
        const CS_CodeDirectory *cd,
-       unsigned page,
-       char *lower_bound,
-       char *upper_bound)
+       uint32_t page,
+       size_t hash_len,
+       const char *lower_bound,
+       const char *upper_bound)
 {
        const unsigned char *base, *top, *hash;
        uint32_t nCodeSlots = ntohl(cd->nCodeSlots);
 
        assert(cs_valid_range(cd, cd + 1, lower_bound, upper_bound));
 
-       if((ntohl(cd->version) >= CS_SUPPORTSSCATTER) && (ntohl(cd->scatterOffset))) {
+       if ((ntohl(cd->version) >= CS_SUPPORTSSCATTER) && (ntohl(cd->scatterOffset))) {
                /* Get first scatter struct */
                const SC_Scatter *scatter = (const SC_Scatter*)
-                       ((const char*)cd + ntohl(cd->scatterOffset));
-               uint32_t hashindex=0, scount, sbase=0;
+                   ((const char*)cd + ntohl(cd->scatterOffset));
+               uint32_t hashindex = 0, scount, sbase = 0;
                /* iterate all scatter structs */
                do {
-                       if((const char*)scatter > (const char*)cd + ntohl(cd->length)) {
-                               if(cs_debug) {
+                       if ((const char*)scatter > (const char*)cd + ntohl(cd->length)) {
+                               if (cs_debug) {
                                        printf("CODE SIGNING: Scatter extends past Code Directory\n");
                                }
                                return NULL;
                        }
-                       
+
                        scount = ntohl(scatter->count);
                        uint32_t new_base = ntohl(scatter->base);
 
@@ -238,13 +295,13 @@ hashes(
                        if (scount == 0) {
                                return NULL;
                        }
-                       
-                       if((hashindex > 0) && (new_base <= sbase)) {
-                               if(cs_debug) {
+
+                       if ((hashindex > 0) && (new_base <= sbase)) {
+                               if (cs_debug) {
                                        printf("CODE SIGNING: unordered Scatter, prev base %d, cur base %d\n",
-                                       sbase, new_base);
+                                           sbase, new_base);
                                }
-                               return NULL;    /* unordered scatter array */
+                               return NULL;    /* unordered scatter array */
                        }
                        sbase = new_base;
 
@@ -252,46 +309,46 @@ hashes(
                        if (sbase > page) {
                                return NULL;
                        }
-                       
-                       if (sbase+scount >= page) {
-                               /* Found the scatter struct that is 
+
+                       if (sbase + scount >= page) {
+                               /* Found the scatter struct that is
                                 * referencing our page */
 
                                /* base = address of first hash covered by scatter */
-                               base = (const unsigned char *)cd + ntohl(cd->hashOffset) + 
-                                       hashindex * SHA1_RESULTLEN;
+                               base = (const unsigned char *)cd + ntohl(cd->hashOffset) +
+                                   hashindex * hash_len;
                                /* top = address of first hash after this scatter */
-                               top = base + scount * SHA1_RESULTLEN;
-                               if (!cs_valid_range(base, top, lower_bound, 
-                                                   upper_bound) ||
+                               top = base + scount * hash_len;
+                               if (!cs_valid_range(base, top, lower_bound,
+                                   upper_bound) ||
                                    hashindex > nCodeSlots) {
                                        return NULL;
                                }
-                               
+
                                break;
                        }
-                       
-                       /* this scatter struct is before the page we're looking 
+
+                       /* this scatter struct is before the page we're looking
                         * for. Iterate. */
-                       hashindex+=scount;
+                       hashindex += scount;
                        scatter++;
-               } while(1);
-               
-               hash = base + (page - sbase) * SHA1_RESULTLEN;
+               } while (1);
+
+               hash = base + (page - sbase) * hash_len;
        } else {
                base = (const unsigned char *)cd + ntohl(cd->hashOffset);
-               top = base + nCodeSlots * SHA1_RESULTLEN;
+               top = base + nCodeSlots * hash_len;
                if (!cs_valid_range(base, top, lower_bound, upper_bound) ||
                    page > nCodeSlots) {
                        return NULL;
                }
                assert(page < nCodeSlots);
 
-               hash = base + page * SHA1_RESULTLEN;
+               hash = base + page * hash_len;
        }
-       
-       if (!cs_valid_range(hash, hash + SHA1_RESULTLEN,
-                           lower_bound, upper_bound)) {
+
+       if (!cs_valid_range(hash, hash + hash_len,
+           lower_bound, upper_bound)) {
                hash = NULL;
        }
 
@@ -314,36 +371,47 @@ hashes(
 static int
 cs_validate_codedirectory(const CS_CodeDirectory *cd, size_t length)
 {
+       struct cs_hash const *hashtype;
 
-       if (length < sizeof(*cd))
+       if (length < sizeof(*cd)) {
                return EBADEXEC;
-       if (ntohl(cd->magic) != CSMAGIC_CODEDIRECTORY)
+       }
+       if (ntohl(cd->magic) != CSMAGIC_CODEDIRECTORY) {
                return EBADEXEC;
-       if (cd->hashSize != SHA1_RESULTLEN)
+       }
+       if (cd->pageSize < PAGE_SHIFT_4K || cd->pageSize > PAGE_SHIFT) {
                return EBADEXEC;
-       if (cd->pageSize != PAGE_SHIFT_4K)
+       }
+       hashtype = cs_find_md(cd->hashType);
+       if (hashtype == NULL) {
                return EBADEXEC;
-       if (cd->hashType != CS_HASHTYPE_SHA1)
+       }
+
+       if (cd->hashSize != hashtype->cs_size) {
                return EBADEXEC;
+       }
 
-       if (length < ntohl(cd->hashOffset))
+       if (length < ntohl(cd->hashOffset)) {
                return EBADEXEC;
+       }
 
        /* check that nSpecialSlots fits in the buffer in front of hashOffset */
-       if (ntohl(cd->hashOffset) / SHA1_RESULTLEN < ntohl(cd->nSpecialSlots))
+       if (ntohl(cd->hashOffset) / hashtype->cs_size < ntohl(cd->nSpecialSlots)) {
                return EBADEXEC;
+       }
 
        /* check that codeslots fits in the buffer */
-       if ((length - ntohl(cd->hashOffset)) / SHA1_RESULTLEN <  ntohl(cd->nCodeSlots))
+       if ((length - ntohl(cd->hashOffset)) / hashtype->cs_size < ntohl(cd->nCodeSlots)) {
                return EBADEXEC;
-       
-       if (ntohl(cd->version) >= CS_SUPPORTSSCATTER && cd->scatterOffset) {
+       }
 
-               if (length < ntohl(cd->scatterOffset))
+       if (ntohl(cd->version) >= CS_SUPPORTSSCATTER && cd->scatterOffset) {
+               if (length < ntohl(cd->scatterOffset)) {
                        return EBADEXEC;
+               }
 
-               SC_Scatter *scatter = (SC_Scatter *)
-                       (((uint8_t *)cd) + ntohl(cd->scatterOffset));
+               const SC_Scatter *scatter = (const SC_Scatter *)
+                   (((const uint8_t *)cd) + ntohl(cd->scatterOffset));
                uint32_t nPages = 0;
 
                /*
@@ -351,15 +419,18 @@ cs_validate_codedirectory(const CS_CodeDirectory *cd, size_t length)
                 * length of the scatter buffer array, we have to
                 * check each entry.
                 */
-               while(1) {
+               while (1) {
                        /* check that the end of each scatter buffer in within the length */
-                       if (((const uint8_t *)scatter) + sizeof(scatter[0]) > (const uint8_t *)cd + length)
+                       if (((const uint8_t *)scatter) + sizeof(scatter[0]) > (const uint8_t *)cd + length) {
                                return EBADEXEC;
+                       }
                        uint32_t scount = ntohl(scatter->count);
-                       if (scount == 0)
+                       if (scount == 0) {
                                break;
-                       if (nPages + scount < nPages)
+                       }
+                       if (nPages + scount < nPages) {
                                return EBADEXEC;
+                       }
                        nPages += scount;
                        scatter++;
 
@@ -367,31 +438,47 @@ cs_validate_codedirectory(const CS_CodeDirectory *cd, size_t length)
                        /* XXX check that targetOffset doesn't overlap */
                }
 #if 0 /* rdar://12579439 */
-               if (nPages != ntohl(cd->nCodeSlots))
+               if (nPages != ntohl(cd->nCodeSlots)) {
                        return EBADEXEC;
+               }
 #endif
        }
 
-       if (length < ntohl(cd->identOffset))
+       if (length < ntohl(cd->identOffset)) {
                return EBADEXEC;
+       }
 
        /* identifier is NUL terminated string */
        if (cd->identOffset) {
-               uint8_t *ptr = (uint8_t *)cd + ntohl(cd->identOffset);
-               if (memchr(ptr, 0, length - ntohl(cd->identOffset)) == NULL)
+               const uint8_t *ptr = (const uint8_t *)cd + ntohl(cd->identOffset);
+               if (memchr(ptr, 0, length - ntohl(cd->identOffset)) == NULL) {
                        return EBADEXEC;
+               }
        }
 
        /* team identifier is NULL terminated string */
        if (ntohl(cd->version) >= CS_SUPPORTSTEAMID && ntohl(cd->teamOffset)) {
-               if (length < ntohl(cd->teamOffset))
+               if (length < ntohl(cd->teamOffset)) {
+                       return EBADEXEC;
+               }
+
+               const uint8_t *ptr = (const uint8_t *)cd + ntohl(cd->teamOffset);
+               if (memchr(ptr, 0, length - ntohl(cd->teamOffset)) == NULL) {
                        return EBADEXEC;
+               }
+       }
+
+       /* linkage is variable length binary data */
+       if (ntohl(cd->version) >= CS_SUPPORTSLINKAGE && cd->linkageHashType != 0) {
+               const uintptr_t ptr = (uintptr_t)cd + ntohl(cd->linkageOffset);
+               const uintptr_t ptr_end = ptr + ntohl(cd->linkageSize);
 
-               uint8_t *ptr = (uint8_t *)cd + ntohl(cd->teamOffset);
-               if (memchr(ptr, 0, length - ntohl(cd->teamOffset)) == NULL)
+               if (ptr_end < ptr || ptr < (uintptr_t)cd || ptr_end > (uintptr_t)cd + length) {
                        return EBADEXEC;
+               }
        }
 
+
        return 0;
 }
 
@@ -402,8 +489,9 @@ cs_validate_codedirectory(const CS_CodeDirectory *cd, size_t length)
 static int
 cs_validate_blob(const CS_GenericBlob *blob, size_t length)
 {
-       if (length < sizeof(CS_GenericBlob) || length < ntohl(blob->length))
+       if (length < sizeof(CS_GenericBlob) || length < ntohl(blob->length)) {
                return EBADEXEC;
+       }
        return 0;
 }
 
@@ -425,66 +513,154 @@ cs_validate_blob(const CS_GenericBlob *blob, size_t length)
  */
 
 static int
-cs_validate_csblob(const uint8_t *addr, size_t length,
-                  const CS_CodeDirectory **rcd)
+cs_validate_csblob(
+       const uint8_t *addr,
+       const size_t blob_size,
+       const CS_CodeDirectory **rcd,
+       const CS_GenericBlob **rentitlements)
 {
-       const CS_GenericBlob *blob = (const CS_GenericBlob *)(void *)addr;
+       const CS_GenericBlob *blob;
        int error;
+       size_t length;
 
        *rcd = NULL;
+       *rentitlements = NULL;
+
+       blob = (const CS_GenericBlob *)(const void *)addr;
 
+       length = blob_size;
        error = cs_validate_blob(blob, length);
-       if (error)
+       if (error) {
                return error;
-
+       }
        length = ntohl(blob->length);
 
        if (ntohl(blob->magic) == CSMAGIC_EMBEDDED_SIGNATURE) {
-               const CS_SuperBlob *sb = (const CS_SuperBlob *)blob;
-               uint32_t n, count = ntohl(sb->count);
+               const CS_SuperBlob *sb;
+               uint32_t n, count;
+               const CS_CodeDirectory *best_cd = NULL;
+               unsigned int best_rank = 0;
+#if PLATFORM_WatchOS
+               const CS_CodeDirectory *sha1_cd = NULL;
+#endif
 
-               if (length < sizeof(CS_SuperBlob))
+               if (length < sizeof(CS_SuperBlob)) {
                        return EBADEXEC;
+               }
+
+               sb = (const CS_SuperBlob *)blob;
+               count = ntohl(sb->count);
 
                /* check that the array of BlobIndex fits in the rest of the data */
-               if ((length - sizeof(CS_SuperBlob)) / sizeof(CS_BlobIndex) < count)
+               if ((length - sizeof(CS_SuperBlob)) / sizeof(CS_BlobIndex) < count) {
                        return EBADEXEC;
+               }
 
                /* now check each BlobIndex */
                for (n = 0; n < count; n++) {
                        const CS_BlobIndex *blobIndex = &sb->index[n];
-                       if (length < ntohl(blobIndex->offset))
+                       uint32_t type = ntohl(blobIndex->type);
+                       uint32_t offset = ntohl(blobIndex->offset);
+                       if (length < offset) {
                                return EBADEXEC;
+                       }
 
                        const CS_GenericBlob *subBlob =
-                               (const CS_GenericBlob *)(void *)(addr + ntohl(blobIndex->offset));
+                           (const CS_GenericBlob *)(const void *)(addr + offset);
 
-                       size_t subLength = length - ntohl(blobIndex->offset);
+                       size_t subLength = length - offset;
 
-                       if ((error = cs_validate_blob(subBlob, subLength)) != 0)
+                       if ((error = cs_validate_blob(subBlob, subLength)) != 0) {
                                return error;
+                       }
                        subLength = ntohl(subBlob->length);
 
                        /* extra validation for CDs, that is also returned */
-                       if (ntohl(blobIndex->type) == CSSLOT_CODEDIRECTORY) {
-                               const CS_CodeDirectory *cd = (const CS_CodeDirectory *)subBlob;
-                               if ((error = cs_validate_codedirectory(cd, subLength)) != 0)
+                       if (type == CSSLOT_CODEDIRECTORY || (type >= CSSLOT_ALTERNATE_CODEDIRECTORIES && type < CSSLOT_ALTERNATE_CODEDIRECTORY_LIMIT)) {
+                               const CS_CodeDirectory *candidate = (const CS_CodeDirectory *)subBlob;
+                               if ((error = cs_validate_codedirectory(candidate, subLength)) != 0) {
                                        return error;
-                               *rcd = cd;
+                               }
+                               unsigned int rank = hash_rank(candidate);
+                               if (cs_debug > 3) {
+                                       printf("CodeDirectory type %d rank %d at slot 0x%x index %d\n", candidate->hashType, (int)rank, (int)type, (int)n);
+                               }
+                               if (best_cd == NULL || rank > best_rank) {
+                                       best_cd = candidate;
+                                       best_rank = rank;
+
+                                       if (cs_debug > 2) {
+                                               printf("using CodeDirectory type %d (rank %d)\n", (int)best_cd->hashType, best_rank);
+                                       }
+                                       *rcd = best_cd;
+                               } else if (best_cd != NULL && rank == best_rank) {
+                                       /* repeat of a hash type (1:1 mapped to ranks), illegal and suspicious */
+                                       printf("multiple hash=%d CodeDirectories in signature; rejecting\n", best_cd->hashType);
+                                       return EBADEXEC;
+                               }
+#if PLATFORM_WatchOS
+                               if (candidate->hashType == CS_HASHTYPE_SHA1) {
+                                       if (sha1_cd != NULL) {
+                                               printf("multiple sha1 CodeDirectories in signature; rejecting\n");
+                                               return EBADEXEC;
+                                       }
+                                       sha1_cd = candidate;
+                               }
+#endif
+                       } else if (type == CSSLOT_ENTITLEMENTS) {
+                               if (ntohl(subBlob->magic) != CSMAGIC_EMBEDDED_ENTITLEMENTS) {
+                                       return EBADEXEC;
+                               }
+                               if (*rentitlements != NULL) {
+                                       printf("multiple entitlements blobs\n");
+                                       return EBADEXEC;
+                               }
+                               *rentitlements = subBlob;
                        }
                }
 
-       } else if (ntohl(blob->magic) == CSMAGIC_CODEDIRECTORY) {
+#if PLATFORM_WatchOS
+               /* To keep watchOS fast enough, we have to resort to sha1 for
+                * some code.
+                *
+                * At the time of writing this comment, known sha1 attacks are
+                * collision attacks (not preimage or second preimage
+                * attacks), which do not apply to platform binaries since
+                * they have a fixed hash in the trust cache.  Given this
+                * property, we only prefer sha1 code directories for adhoc
+                * signatures, which always have to be in a trust cache to be
+                * valid (can-load-cdhash does not exist for watchOS). Those
+                * are, incidentally, also the platform binaries, for which we
+                * care about the performance hit that sha256 would bring us.
+                *
+                * Platform binaries may still contain a (not chosen) sha256
+                * code directory, which keeps software updates that switch to
+                * sha256-only small.
+                */
 
-               if ((error = cs_validate_codedirectory((const CS_CodeDirectory *)(void *)addr, length)) != 0)
+               if (*rcd != NULL && sha1_cd != NULL && (ntohl(sha1_cd->flags) & CS_ADHOC)) {
+                       if (sha1_cd->flags != (*rcd)->flags) {
+                               printf("mismatched flags between hash %d (flags: %#x) and sha1 (flags: %#x) cd.\n",
+                                   (int)(*rcd)->hashType, (*rcd)->flags, sha1_cd->flags);
+                               *rcd = NULL;
+                               return EBADEXEC;
+                       }
+
+                       *rcd = sha1_cd;
+               }
+#endif
+       } else if (ntohl(blob->magic) == CSMAGIC_CODEDIRECTORY) {
+               if ((error = cs_validate_codedirectory((const CS_CodeDirectory *)(const void *)addr, length)) != 0) {
                        return error;
+               }
                *rcd = (const CS_CodeDirectory *)blob;
        } else {
                return EBADEXEC;
        }
 
-       if (*rcd == NULL)
+       if (*rcd == NULL) {
                return EBADEXEC;
+       }
 
        return 0;
 }
@@ -494,8 +670,8 @@ cs_validate_csblob(const uint8_t *addr, size_t length,
  *
  * Find an blob from the superblob/code directory. The blob must have
  * been been validated by cs_validate_csblob() before calling
- * this. Use cs_find_blob() instead.
- * 
+ * this. Use csblob_find_blob() instead.
+ *
  * Will also find a "raw" code directory if its stored as well as
  * searching the superblob.
  *
@@ -508,223 +684,122 @@ cs_validate_csblob(const uint8_t *addr, size_t length,
  *             NULL                    Buffer not found
  */
 
-static const CS_GenericBlob *
-cs_find_blob_bytes(const uint8_t *addr, size_t length, uint32_t type, uint32_t magic)
+const CS_GenericBlob *
+csblob_find_blob_bytes(const uint8_t *addr, size_t length, uint32_t type, uint32_t magic)
 {
-       const CS_GenericBlob *blob = (const CS_GenericBlob *)(void *)addr;
+       const CS_GenericBlob *blob = (const CS_GenericBlob *)(const void *)addr;
 
        if (ntohl(blob->magic) == CSMAGIC_EMBEDDED_SIGNATURE) {
                const CS_SuperBlob *sb = (const CS_SuperBlob *)blob;
                size_t n, count = ntohl(sb->count);
 
                for (n = 0; n < count; n++) {
-                       if (ntohl(sb->index[n].type) != type)
+                       if (ntohl(sb->index[n].type) != type) {
                                continue;
+                       }
                        uint32_t offset = ntohl(sb->index[n].offset);
-                       if (length - sizeof(const CS_GenericBlob) < offset)
+                       if (length - sizeof(const CS_GenericBlob) < offset) {
                                return NULL;
-                       blob = (const CS_GenericBlob *)(void *)(addr + offset);
-                       if (ntohl(blob->magic) != magic)
+                       }
+                       blob = (const CS_GenericBlob *)(const void *)(addr + offset);
+                       if (ntohl(blob->magic) != magic) {
                                continue;
+                       }
                        return blob;
                }
        } else if (type == CSSLOT_CODEDIRECTORY
-                  && ntohl(blob->magic) == CSMAGIC_CODEDIRECTORY
-                  && magic == CSMAGIC_CODEDIRECTORY)
+           && ntohl(blob->magic) == CSMAGIC_CODEDIRECTORY
+           && magic == CSMAGIC_CODEDIRECTORY) {
                return blob;
+       }
        return NULL;
 }
 
 
 const CS_GenericBlob *
-cs_find_blob(struct cs_blob *csblob, uint32_t type, uint32_t magic)
+csblob_find_blob(struct cs_blob *csblob, uint32_t type, uint32_t magic)
 {
-       if ((csblob->csb_flags & CS_VALID) == 0)
+       if ((csblob->csb_flags & CS_VALID) == 0) {
                return NULL;
-       return cs_find_blob_bytes((const uint8_t *)csblob->csb_mem_kaddr, csblob->csb_mem_size, type, magic);
+       }
+       return csblob_find_blob_bytes((const uint8_t *)csblob->csb_mem_kaddr, csblob->csb_mem_size, type, magic);
 }
 
 static const uint8_t *
-cs_find_special_slot(const CS_CodeDirectory *cd, uint32_t slot)
+find_special_slot(const CS_CodeDirectory *cd, size_t slotsize, uint32_t slot)
 {
        /* there is no zero special slot since that is the first code slot */
-       if (ntohl(cd->nSpecialSlots) < slot || slot == 0)
+       if (ntohl(cd->nSpecialSlots) < slot || slot == 0) {
                return NULL;
+       }
 
-       return ((const uint8_t *)cd + ntohl(cd->hashOffset) - (SHA1_RESULTLEN * slot));
+       return (const uint8_t *)cd + ntohl(cd->hashOffset) - (slotsize * slot);
 }
 
-/*
- * CODESIGNING
- * End of routines to navigate code signing data structures in the kernel.
- */
-
-/*
- * ENTITLEMENTS
- * Routines to navigate entitlements in the kernel.
- */
-
-/* Retrieve the entitlements blob for a process.
- * Returns:
- *   EINVAL    no text vnode associated with the process
- *   EBADEXEC   invalid code signing data
- *   0         no error occurred
- *
- * On success, out_start and out_length will point to the
- * entitlements blob if found; or will be set to NULL/zero
- * if there were no entitlements.
- */
-
-static uint8_t sha1_zero[SHA1_RESULTLEN] = { 0 };
+static uint8_t cshash_zero[CS_HASH_MAX_SIZE] = { 0 };
 
 int
-cs_entitlements_blob_get(proc_t p, void **out_start, size_t *out_length)
+csblob_get_entitlements(struct cs_blob *csblob, void **out_start, size_t *out_length)
 {
-       uint8_t computed_hash[SHA1_RESULTLEN];
+       uint8_t computed_hash[CS_HASH_MAX_SIZE];
        const CS_GenericBlob *entitlements;
        const CS_CodeDirectory *code_dir;
-       struct cs_blob *csblob;
        const uint8_t *embedded_hash;
-       SHA1_CTX context;
+       union cs_hash_union context;
 
        *out_start = NULL;
        *out_length = 0;
 
-       if (NULL == p->p_textvp)
-               return EINVAL;
-
-       if ((csblob = ubc_cs_blob_get(p->p_textvp, -1, p->p_textoff)) == NULL)
-               return 0;
+       if (csblob->csb_hashtype == NULL || csblob->csb_hashtype->cs_digest_size > sizeof(computed_hash)) {
+               return EBADEXEC;
+       }
 
-       if ((code_dir = (const CS_CodeDirectory *)cs_find_blob(csblob, CSSLOT_CODEDIRECTORY, CSMAGIC_CODEDIRECTORY)) == NULL)
-               return 0;
+       code_dir = csblob->csb_cd;
 
-       entitlements = cs_find_blob(csblob, CSSLOT_ENTITLEMENTS, CSMAGIC_EMBEDDED_ENTITLEMENTS);
-       embedded_hash = cs_find_special_slot(code_dir, CSSLOT_ENTITLEMENTS);
+       if ((csblob->csb_flags & CS_VALID) == 0) {
+               entitlements = NULL;
+       } else {
+               entitlements = csblob->csb_entitlements_blob;
+       }
+       embedded_hash = find_special_slot(code_dir, csblob->csb_hashtype->cs_size, CSSLOT_ENTITLEMENTS);
 
        if (embedded_hash == NULL) {
-               if (entitlements)
+               if (entitlements) {
                        return EBADEXEC;
+               }
                return 0;
-       } else if (entitlements == NULL && memcmp(embedded_hash, sha1_zero, SHA1_RESULTLEN) != 0) {
-               return EBADEXEC;
+       } else if (entitlements == NULL) {
+               if (memcmp(embedded_hash, cshash_zero, csblob->csb_hashtype->cs_size) != 0) {
+                       return EBADEXEC;
+               } else {
+                       return 0;
+               }
        }
 
-       SHA1Init(&context);
-       SHA1Update(&context, entitlements, ntohl(entitlements->length));
-       SHA1Final(computed_hash, &context);
-       if (memcmp(computed_hash, embedded_hash, SHA1_RESULTLEN) != 0)
+       csblob->csb_hashtype->cs_init(&context);
+       ptrauth_utils_auth_blob_generic(entitlements,
+           ntohl(entitlements->length),
+           OS_PTRAUTH_DISCRIMINATOR("cs_blob.csb_entitlements_blob_signature"),
+           PTRAUTH_ADDR_DIVERSIFY,
+           csblob->csb_entitlements_blob_signature);
+       csblob->csb_hashtype->cs_update(&context, entitlements, ntohl(entitlements->length));
+       csblob->csb_hashtype->cs_final(computed_hash, &context);
+
+       if (memcmp(computed_hash, embedded_hash, csblob->csb_hashtype->cs_size) != 0) {
                return EBADEXEC;
+       }
 
-       *out_start = (void *)entitlements;
+       *out_start = __DECONST(void *, entitlements);
        *out_length = ntohl(entitlements->length);
 
        return 0;
 }
 
-/* Retrieve the codesign identity for a process.
- * Returns:
- *   NULL      an error occured
- *   string    the cs_identity
- */
-
-const char *
-cs_identity_get(proc_t p)
-{
-       const CS_CodeDirectory *code_dir;
-       struct cs_blob *csblob;
-
-       if (NULL == p->p_textvp)
-               return NULL;
-
-       if ((csblob = ubc_cs_blob_get(p->p_textvp, -1, p->p_textoff)) == NULL)
-               return NULL;
-
-       if ((code_dir = (const CS_CodeDirectory *)cs_find_blob(csblob, CSSLOT_CODEDIRECTORY, CSMAGIC_CODEDIRECTORY)) == NULL)
-               return NULL;
-
-       if (code_dir->identOffset == 0)
-               return NULL;
-
-       return ((const char *)code_dir) + ntohl(code_dir->identOffset);
-}
-
-
-
-/* Retrieve the codesign blob for a process.
- * Returns:
- *   EINVAL    no text vnode associated with the process
- *   0         no error occurred
- *
- * On success, out_start and out_length will point to the
- * cms blob if found; or will be set to NULL/zero
- * if there were no blob.
- */
-
-int
-cs_blob_get(proc_t p, void **out_start, size_t *out_length)
-{
-       struct cs_blob *csblob;
-
-       *out_start = NULL;
-       *out_length = 0;
-
-       if (NULL == p->p_textvp)
-               return EINVAL;
-
-       if ((csblob = ubc_cs_blob_get(p->p_textvp, -1, p->p_textoff)) == NULL)
-               return 0;
-
-       *out_start = (void *)csblob->csb_mem_kaddr;
-       *out_length = csblob->csb_mem_size;
-
-       return 0;
-}
-
-uint8_t *
-cs_get_cdhash(struct proc *p)
-{
-       struct cs_blob *csblob;
-
-       if (NULL == p->p_textvp)
-               return NULL;
-
-       if ((csblob = ubc_cs_blob_get(p->p_textvp, -1, p->p_textoff)) == NULL)
-               return NULL;
-
-       return csblob->csb_sha1;
-}
-
-/*
- * ENTITLEMENTS
- * End of routines to navigate entitlements in the kernel.
- */
-
-
-
 /*
- * ubc_init
- * 
- * Initialization of the zone for Unified Buffer Cache.
- *
- * Parameters: (void)
- *
- * Returns:    (void)
- *
- * Implicit returns:
- *             ubc_info_zone(global)   initialized for subsequent allocations
+ * CODESIGNING
+ * End of routines to navigate code signing data structures in the kernel.
  */
-__private_extern__ void
-ubc_init(void)
-{
-       int     i;
-
-       i = (vm_size_t) sizeof (struct ubc_info);
 
-       ubc_info_zone = zinit (i, 10000*i, 8192, "ubc_info zone");
-
-       zone_change(ubc_info_zone, Z_NOENCRYPT, TRUE);
-}
 
 
 /*
@@ -742,7 +817,7 @@ ubc_init(void)
 int
 ubc_info_init(struct vnode *vp)
 {
-       return(ubc_info_init_internal(vp, 0, 0));
+       return ubc_info_init_internal(vp, 0, 0);
 }
 
 
@@ -761,7 +836,7 @@ ubc_info_init(struct vnode *vp)
 int
 ubc_info_init_withsize(struct vnode *vp, off_t filesize)
 {
-       return(ubc_info_init_internal(vp, 1, filesize));
+       return ubc_info_init_internal(vp, 1, filesize);
 }
 
 
@@ -796,7 +871,7 @@ ubc_info_init_withsize(struct vnode *vp, off_t filesize)
 static int
 ubc_info_init_internal(vnode_t vp, int withfsize, off_t filesize)
 {
-       register struct ubc_info        *uip;
+       struct ubc_info *uip;
        void *  pager;
        int error = 0;
        kern_return_t kret;
@@ -809,7 +884,6 @@ ubc_info_init_internal(vnode_t vp, int withfsize, off_t filesize)
         * attach one; otherwise, we will reuse the one that's there.
         */
        if (uip == UBC_INFO_NULL) {
-
                uip = (struct ubc_info *) zalloc(ubc_info_zone);
                bzero((char *)uip, sizeof(struct ubc_info));
 
@@ -857,26 +931,28 @@ ubc_info_init_internal(vnode_t vp, int withfsize, off_t filesize)
         * vnode_pager_setup() returned here.
         */
        kret = memory_object_create_named(pager,
-               (memory_object_size_t)uip->ui_size, &control);
-       vnode_pager_deallocate(pager); 
-       if (kret != KERN_SUCCESS)
+           (memory_object_size_t)uip->ui_size, &control);
+       vnode_pager_deallocate(pager);
+       if (kret != KERN_SUCCESS) {
                panic("ubc_info_init: memory_object_create_named returned %d", kret);
+       }
 
        assert(control);
-       uip->ui_control = control;      /* cache the value of the mo control */
-       SET(uip->ui_flags, UI_HASOBJREF);       /* with a named reference */
+       uip->ui_control = control;      /* cache the value of the mo control */
+       SET(uip->ui_flags, UI_HASOBJREF);       /* with a named reference */
 
        if (withfsize == 0) {
                /* initialize the size */
                error = vnode_size(vp, &uip->ui_size, vfs_context_current());
-               if (error)
+               if (error) {
                        uip->ui_size = 0;
+               }
        } else {
                uip->ui_size = filesize;
        }
-       vp->v_lflag |= VNAMED_UBC;      /* vnode has a named ubc reference */
+       vp->v_lflag |= VNAMED_UBC;      /* vnode has a named ubc reference */
 
-       return (error);
+       return error;
 }
 
 
@@ -903,9 +979,10 @@ ubc_info_free(struct ubc_info *uip)
                kauth_cred_unref(&uip->ui_ucred);
        }
 
-       if (uip->ui_control != MEMORY_OBJECT_CONTROL_NULL)
+       if (uip->ui_control != MEMORY_OBJECT_CONTROL_NULL) {
                memory_object_control_deallocate(uip->ui_control);
-       
+       }
+
        cluster_release(uip);
        ubc_cs_free(uip);
 
@@ -917,14 +994,11 @@ ubc_info_free(struct ubc_info *uip)
 void
 ubc_info_deallocate(struct ubc_info *uip)
 {
-        ubc_info_free(uip);
+       ubc_info_free(uip);
 }
 
-/* 
- * This should be public but currently it is only used below so we
- * defer making that change.
- */
-static errno_t mach_to_bsd_errno(kern_return_t mach_err)
+errno_t
+mach_to_bsd_errno(kern_return_t mach_err)
 {
        switch (mach_err) {
        case KERN_SUCCESS:
@@ -1037,32 +1111,36 @@ static errno_t mach_to_bsd_errno(kern_return_t mach_err)
  *                 flushed, if the new size is not aligned to a page
  *                 boundary.  This is usually indicative of an I/O error.
  */
-errno_t ubc_setsize_ex(struct vnode *vp, off_t nsize, ubc_setsize_opts_t opts)
+errno_t
+ubc_setsize_ex(struct vnode *vp, off_t nsize, ubc_setsize_opts_t opts)
 {
-       off_t osize;    /* ui_size before change */
+       off_t osize;    /* ui_size before change */
        off_t lastpg, olastpgend, lastoff;
        struct ubc_info *uip;
        memory_object_control_t control;
        kern_return_t kret = KERN_SUCCESS;
 
-       if (nsize < (off_t)0)
+       if (nsize < (off_t)0) {
                return EINVAL;
+       }
 
-       if (!UBCINFOEXISTS(vp))
+       if (!UBCINFOEXISTS(vp)) {
                return ENOENT;
+       }
 
        uip = vp->v_ubcinfo;
        osize = uip->ui_size;
 
-       if (ISSET(opts, UBC_SETSIZE_NO_FS_REENTRY) && nsize < osize)
+       if (ISSET(opts, UBC_SETSIZE_NO_FS_REENTRY) && nsize < osize) {
                return EAGAIN;
+       }
 
        /*
         * Update the size before flushing the VM
         */
        uip->ui_size = nsize;
 
-       if (nsize >= osize) {   /* Nothing more to do */
+       if (nsize >= osize) {   /* Nothing more to do */
                if (nsize > osize) {
                        lock_vnode_and_post(vp, NOTE_EXTEND);
                }
@@ -1083,49 +1161,54 @@ errno_t ubc_setsize_ex(struct vnode *vp, off_t nsize, ubc_setsize_opts_t opts)
        lastoff = (nsize & PAGE_MASK_64);
 
        if (lastoff) {
-               upl_t           upl;
-               upl_page_info_t *pl;
+               upl_t           upl;
+               upl_page_info_t *pl;
 
                /*
                 * new EOF ends up in the middle of a page
                 * zero the tail of this page if it's currently
                 * present in the cache
                 */
-               kret = ubc_create_upl(vp, lastpg, PAGE_SIZE, &upl, &pl, UPL_SET_LITE);
+               kret = ubc_create_upl_kernel(vp, lastpg, PAGE_SIZE, &upl, &pl, UPL_SET_LITE | UPL_WILL_MODIFY, VM_KERN_MEMORY_FILE);
 
-               if (kret != KERN_SUCCESS)
-                       panic("ubc_setsize: ubc_create_upl (error = %d)\n", kret);
+               if (kret != KERN_SUCCESS) {
+                       panic("ubc_setsize: ubc_create_upl (error = %d)\n", kret);
+               }
 
-               if (upl_valid_page(pl, 0))
-                       cluster_zero(upl, (uint32_t)lastoff, PAGE_SIZE - (uint32_t)lastoff, NULL);
+               if (upl_valid_page(pl, 0)) {
+                       cluster_zero(upl, (uint32_t)lastoff, PAGE_SIZE - (uint32_t)lastoff, NULL);
+               }
 
                ubc_upl_abort_range(upl, 0, PAGE_SIZE, UPL_ABORT_FREE_ON_EMPTY);
 
                lastpg += PAGE_SIZE_64;
        }
        if (olastpgend > lastpg) {
-               int     flags;
+               int     flags;
 
-               if (lastpg == 0)
+               if (lastpg == 0) {
                        flags = MEMORY_OBJECT_DATA_FLUSH_ALL;
-               else
+               } else {
                        flags = MEMORY_OBJECT_DATA_FLUSH;
+               }
                /*
                 * invalidate the pages beyond the new EOF page
                 *
                 */
                kret = memory_object_lock_request(control,
-                                                                                 (memory_object_offset_t)lastpg,
-                                                                                 (memory_object_size_t)(olastpgend - lastpg), NULL, NULL,
-                                                                                 MEMORY_OBJECT_RETURN_NONE, flags, VM_PROT_NO_CHANGE);
-               if (kret != KERN_SUCCESS)
-                       printf("ubc_setsize: invalidate failed (error = %d)\n", kret);
+                   (memory_object_offset_t)lastpg,
+                   (memory_object_size_t)(olastpgend - lastpg), NULL, NULL,
+                   MEMORY_OBJECT_RETURN_NONE, flags, VM_PROT_NO_CHANGE);
+               if (kret != KERN_SUCCESS) {
+                       printf("ubc_setsize: invalidate failed (error = %d)\n", kret);
+               }
        }
        return mach_to_bsd_errno(kret);
 }
 
 // Returns true for success
-int ubc_setsize(vnode_t vp, off_t nsize)
+int
+ubc_setsize(vnode_t vp, off_t nsize)
 {
        return ubc_setsize_ex(vp, nsize, 0) == 0;
 }
@@ -1152,11 +1235,12 @@ off_t
 ubc_getsize(struct vnode *vp)
 {
        /* people depend on the side effect of this working this way
-        * as they call this for directory 
+        * as they call this for directory
         */
-       if (!UBCINFOEXISTS(vp))
-               return ((off_t)0);
-       return (vp->v_ubcinfo->ui_size);
+       if (!UBCINFOEXISTS(vp)) {
+               return (off_t)0;
+       }
+       return vp->v_ubcinfo->ui_size;
 }
 
 
@@ -1187,7 +1271,7 @@ __private_extern__ int
 ubc_umount(struct mount *mp)
 {
        vnode_iterate(mp, 0, ubc_umcallback, 0);
-       return(0);
+       return 0;
 }
 
 
@@ -1200,12 +1284,10 @@ ubc_umount(struct mount *mp)
 static int
 ubc_umcallback(vnode_t vp, __unused void * args)
 {
-
        if (UBCINFOEXISTS(vp)) {
-
                (void) ubc_msync(vp, (off_t)0, ubc_getsize(vp), NULL, UBC_PUSHALL);
        }
-       return (VNODE_RETURNED);
+       return VNODE_RETURNED;
 }
 
 
@@ -1227,10 +1309,11 @@ ubc_umcallback(vnode_t vp, __unused void * args)
 kauth_cred_t
 ubc_getcred(struct vnode *vp)
 {
-        if (UBCINFOEXISTS(vp))
-               return (vp->v_ubcinfo->ui_ucred);
+       if (UBCINFOEXISTS(vp)) {
+               return vp->v_ubcinfo->ui_ucred;
+       }
 
-       return (NOCRED);
+       return NOCRED;
 }
 
 
@@ -1296,8 +1379,9 @@ ubc_setthreadcred(struct vnode *vp, proc_t p, thread_t thread)
        kauth_cred_t credp;
        struct uthread  *uthread = get_bsdthread_info(thread);
 
-       if (!UBCINFOEXISTS(vp))
-               return (1); 
+       if (!UBCINFOEXISTS(vp)) {
+               return 1;
+       }
 
        vnode_lock(vp);
 
@@ -1312,10 +1396,10 @@ ubc_setthreadcred(struct vnode *vp, proc_t p, thread_t thread)
                        uip->ui_ucred = uthread->uu_ucred;
                        kauth_cred_ref(uip->ui_ucred);
                }
-       } 
+       }
        vnode_unlock(vp);
 
-       return (0);
+       return 0;
 }
 
 
@@ -1343,7 +1427,7 @@ ubc_setthreadcred(struct vnode *vp, proc_t p, thread_t thread)
  *             not be used, as it is incompatible with per-thread credentials;
  *             it exists for legacy KPI reasons.
  *
- * DEPRECATION:        ubc_setcred() is being deprecated. Please use 
+ * DEPRECATION:        ubc_setcred() is being deprecated. Please use
  *             ubc_setthreadcred() instead.
  */
 int
@@ -1353,8 +1437,9 @@ ubc_setcred(struct vnode *vp, proc_t p)
        kauth_cred_t credp;
 
        /* If there is no ubc_info, deny the operation */
-       if ( !UBCINFOEXISTS(vp))
-               return (0); 
+       if (!UBCINFOEXISTS(vp)) {
+               return 0;
+       }
 
        /*
         * Check to see if there is already a credential reference in the
@@ -1365,10 +1450,10 @@ ubc_setcred(struct vnode *vp, proc_t p)
        credp = uip->ui_ucred;
        if (!IS_VALID_CRED(credp)) {
                uip->ui_ucred = kauth_cred_proc_ref(p);
-       } 
+       }
        vnode_unlock(vp);
 
-       return (1);
+       return 1;
 }
 
 /*
@@ -1389,10 +1474,11 @@ ubc_setcred(struct vnode *vp, proc_t p)
 __private_extern__ memory_object_t
 ubc_getpager(struct vnode *vp)
 {
-        if (UBCINFOEXISTS(vp))
-               return (vp->v_ubcinfo->ui_pager);
+       if (UBCINFOEXISTS(vp)) {
+               return vp->v_ubcinfo->ui_pager;
+       }
 
-       return (0);
+       return 0;
 }
 
 
@@ -1422,21 +1508,11 @@ ubc_getpager(struct vnode *vp)
 memory_object_control_t
 ubc_getobject(struct vnode *vp, __unused int flags)
 {
-        if (UBCINFOEXISTS(vp))
-               return((vp->v_ubcinfo->ui_control));
-
-       return (MEMORY_OBJECT_CONTROL_NULL);
-}
-
-boolean_t
-ubc_strict_uncached_IO(struct vnode *vp)
-{
-        boolean_t result = FALSE;
-
        if (UBCINFOEXISTS(vp)) {
-               result = memory_object_is_slid(vp->v_ubcinfo->ui_control);
+               return vp->v_ubcinfo->ui_control;
        }
-       return result;
+
+       return MEMORY_OBJECT_CONTROL_NULL;
 }
 
 /*
@@ -1472,11 +1548,12 @@ ubc_blktooff(vnode_t vp, daddr64_t blkno)
 
        if (UBCINFOEXISTS(vp)) {
                error = VNOP_BLKTOOFF(vp, blkno, &file_offset);
-               if (error)
+               if (error) {
                        file_offset = -1;
+               }
        }
 
-       return (file_offset);
+       return file_offset;
 }
 
 
@@ -1515,11 +1592,12 @@ ubc_offtoblk(vnode_t vp, off_t offset)
 
        if (UBCINFOEXISTS(vp)) {
                error = VNOP_OFFTOBLK(vp, offset, &blkno);
-               if (error)
+               if (error) {
                        blkno = -1;
+               }
        }
 
-       return (blkno);
+       return blkno;
 }
 
 
@@ -1537,12 +1615,13 @@ ubc_offtoblk(vnode_t vp, off_t offset)
 int
 ubc_pages_resident(vnode_t vp)
 {
-       kern_return_t           kret;
-       boolean_t                       has_pages_resident;
-       
-       if (!UBCINFOEXISTS(vp))
-               return (0);
-                       
+       kern_return_t           kret;
+       boolean_t                       has_pages_resident;
+
+       if (!UBCINFOEXISTS(vp)) {
+               return 0;
+       }
+
        /*
         * The following call may fail if an invalid ui_control is specified,
         * or if there is no VM object associated with the control object.  In
@@ -1550,14 +1629,16 @@ ubc_pages_resident(vnode_t vp)
         * result in correct behavior.
         */
        kret = memory_object_pages_resident(vp->v_ubcinfo->ui_control, &has_pages_resident);
-       
-       if (kret != KERN_SUCCESS)
-               return (0);
-               
-       if (has_pages_resident == TRUE)
-               return (1);
-               
-       return (0);
+
+       if (kret != KERN_SUCCESS) {
+               return 0;
+       }
+
+       if (has_pages_resident == TRUE) {
+               return 1;
+       }
+
+       return 0;
 }
 
 /*
@@ -1596,17 +1677,19 @@ ubc_pages_resident(vnode_t vp)
 errno_t
 ubc_msync(vnode_t vp, off_t beg_off, off_t end_off, off_t *resid_off, int flags)
 {
-        int retval;
+       int retval;
        int io_errno = 0;
-       
-       if (resid_off)
-               *resid_off = beg_off;
 
-        retval = ubc_msync_internal(vp, beg_off, end_off, resid_off, flags, &io_errno);
+       if (resid_off) {
+               *resid_off = beg_off;
+       }
+
+       retval = ubc_msync_internal(vp, beg_off, end_off, resid_off, flags, &io_errno);
 
-       if (retval == 0 && io_errno == 0)
-               return (EINVAL);
-       return (io_errno);
+       if (retval == 0 && io_errno == 0) {
+               return EINVAL;
+       }
+       return io_errno;
 }
 
 
@@ -1676,42 +1759,49 @@ ubc_msync(vnode_t vp, off_t beg_off, off_t end_off, off_t *resid_off, int flags)
 static int
 ubc_msync_internal(vnode_t vp, off_t beg_off, off_t end_off, off_t *resid_off, int flags, int *io_errno)
 {
-       memory_object_size_t    tsize;
-       kern_return_t           kret;
+       memory_object_size_t    tsize;
+       kern_return_t           kret;
        int request_flags = 0;
        int flush_flags   = MEMORY_OBJECT_RETURN_NONE;
-       
-       if ( !UBCINFOEXISTS(vp))
-               return (0);
-       if ((flags & (UBC_INVALIDATE | UBC_PUSHDIRTY | UBC_PUSHALL)) == 0)
-               return (0);
-       if (end_off <= beg_off)
-               return (1);
-
-       if (flags & UBC_INVALIDATE)
-               /*
-                * discard the resident pages
-                */
+
+       if (!UBCINFOEXISTS(vp)) {
+               return 0;
+       }
+       if ((flags & (UBC_INVALIDATE | UBC_PUSHDIRTY | UBC_PUSHALL)) == 0) {
+               return 0;
+       }
+       if (end_off <= beg_off) {
+               return 1;
+       }
+
+       if (flags & UBC_INVALIDATE) {
+               /*
+                * discard the resident pages
+                */
                request_flags = (MEMORY_OBJECT_DATA_FLUSH | MEMORY_OBJECT_DATA_NO_CHANGE);
+       }
 
-       if (flags & UBC_SYNC)
-               /*
+       if (flags & UBC_SYNC) {
+               /*
                 * wait for all the I/O to complete before returning
                 */
-               request_flags |= MEMORY_OBJECT_IO_SYNC;
+               request_flags |= MEMORY_OBJECT_IO_SYNC;
+       }
 
-       if (flags & UBC_PUSHDIRTY)
-               /*
+       if (flags & UBC_PUSHDIRTY) {
+               /*
                 * we only return the dirty pages in the range
                 */
-               flush_flags = MEMORY_OBJECT_RETURN_DIRTY;
+               flush_flags = MEMORY_OBJECT_RETURN_DIRTY;
+       }
 
-       if (flags & UBC_PUSHALL)
-               /*
+       if (flags & UBC_PUSHALL) {
+               /*
                 * then return all the interesting pages in the range (both
                 * dirty and precious) to the pager
                 */
-               flush_flags = MEMORY_OBJECT_RETURN_ALL;
+               flush_flags = MEMORY_OBJECT_RETURN_ALL;
+       }
 
        beg_off = trunc_page_64(beg_off);
        end_off = round_page_64(end_off);
@@ -1719,12 +1809,12 @@ ubc_msync_internal(vnode_t vp, off_t beg_off, off_t end_off, off_t *resid_off, i
 
        /* flush and/or invalidate pages in the range requested */
        kret = memory_object_lock_request(vp->v_ubcinfo->ui_control,
-                                         beg_off, tsize,
-                                         (memory_object_offset_t *)resid_off,
-                                         io_errno, flush_flags, request_flags,
-                                         VM_PROT_NO_CHANGE);
-       
-       return ((kret == KERN_SUCCESS) ? 1 : 0);
+           beg_off, tsize,
+           (memory_object_offset_t *)resid_off,
+           io_errno, flush_flags, request_flags,
+           VM_PROT_NO_CHANGE);
+
+       return (kret == KERN_SUCCESS) ? 1 : 0;
 }
 
 
@@ -1787,28 +1877,39 @@ ubc_map(vnode_t vp, int flags)
        int need_wakeup = 0;
 
        if (UBCINFOEXISTS(vp)) {
-
                vnode_lock(vp);
                uip = vp->v_ubcinfo;
 
                while (ISSET(uip->ui_flags, UI_MAPBUSY)) {
                        SET(uip->ui_flags, UI_MAPWAITING);
                        (void) msleep(&uip->ui_flags, &vp->v_lock,
-                                     PRIBIO, "ubc_map", NULL);
+                           PRIBIO, "ubc_map", NULL);
                }
                SET(uip->ui_flags, UI_MAPBUSY);
                vnode_unlock(vp);
 
                error = VNOP_MMAP(vp, flags, vfs_context_current());
 
-               if (error != EPERM)
-                       error = 0;
+               /*
+                * rdar://problem/22587101 required that we stop propagating
+                * EPERM up the stack. Otherwise, we would have to funnel up
+                * the error at all the call sites for memory_object_map().
+                * The risk is in having to undo the map/object/entry state at
+                * all these call sites. It would also affect more than just mmap()
+                * e.g. vm_remap().
+                *
+                *      if (error != EPERM)
+                *              error = 0;
+                */
+
+               error = 0;
 
                vnode_lock_spin(vp);
 
                if (error == 0) {
-                       if ( !ISSET(uip->ui_flags, UI_ISMAPPED))
-                               need_ref = 1;
+                       if (!ISSET(uip->ui_flags, UI_ISMAPPED)) {
+                               need_ref = 1;
+                       }
                        SET(uip->ui_flags, (UI_WASMAPPED | UI_ISMAPPED));
                        if (flags & PROT_WRITE) {
                                SET(uip->ui_flags, UI_MAPPEDWRITE);
@@ -1822,13 +1923,47 @@ ubc_map(vnode_t vp, int flags)
                }
                vnode_unlock(vp);
 
-               if (need_wakeup)
+               if (need_wakeup) {
                        wakeup(&uip->ui_flags);
+               }
 
-               if (need_ref)
-                       vnode_ref(vp);
+               if (need_ref) {
+                       /*
+                        * Make sure we get a ref as we can't unwind from here
+                        */
+                       if (vnode_ref_ext(vp, 0, VNODE_REF_FORCE)) {
+                               panic("%s : VNODE_REF_FORCE failed\n", __FUNCTION__);
+                       }
+                       /*
+                        * Vnodes that are on "unreliable" media (like disk
+                        * images, network filesystems, 3rd-party filesystems,
+                        * and possibly external devices) could see their
+                        * contents be changed via the backing store without
+                        * triggering copy-on-write, so we can't fully rely
+                        * on copy-on-write and might have to resort to
+                        * copy-on-read to protect "privileged" processes and
+                        * prevent privilege escalation.
+                        *
+                        * The root filesystem is considered "reliable" because
+                        * there's not much point in trying to protect
+                        * ourselves from such a vulnerability and the extra
+                        * cost of copy-on-read (CPU time and memory pressure)
+                        * could result in some serious regressions.
+                        */
+                       if (vp->v_mount != NULL &&
+                           ((vp->v_mount->mnt_flag & MNT_ROOTFS) ||
+                           vnode_on_reliable_media(vp))) {
+                               /*
+                                * This vnode is deemed "reliable" so mark
+                                * its VM object as "trusted".
+                                */
+                               memory_object_mark_trusted(uip->ui_control);
+                       } else {
+//                             printf("BUGGYCOW: %s:%d vp %p \"%s\" in mnt %p \"%s\" is untrusted\n", __FUNCTION__, __LINE__, vp, vp->v_name, vp->v_mount, vp->v_mount->mnt_vnodecovered->v_name);
+                       }
+               }
        }
-       return (error);
+       return error;
 }
 
 
@@ -1864,14 +1999,15 @@ ubc_destroy_named(vnode_t vp)
        kern_return_t kret;
 
        if (UBCINFOEXISTS(vp)) {
-               uip = vp->v_ubcinfo;
+               uip = vp->v_ubcinfo;
 
                /* Terminate the memory object  */
                control = ubc_getobject(vp, UBC_HOLDOBJECT);
                if (control != MEMORY_OBJECT_CONTROL_NULL) {
-                       kret = memory_object_destroy(control, 0);
-                       if (kret != KERN_SUCCESS)
-                               panic("ubc_destroy_named: memory_object_destroy failed");
+                       kret = memory_object_destroy(control, 0);
+                       if (kret != KERN_SUCCESS) {
+                               panic("ubc_destroy_named: memory_object_destroy failed");
+                       }
                }
        }
 }
@@ -1904,9 +2040,10 @@ ubc_destroy_named(vnode_t vp)
 int
 ubc_isinuse(struct vnode *vp, int busycount)
 {
-       if ( !UBCINFOEXISTS(vp))
-               return (0);
-       return(ubc_isinuse_locked(vp, busycount, 0));
+       if (!UBCINFOEXISTS(vp)) {
+               return 0;
+       }
+       return ubc_isinuse_locked(vp, busycount, 0);
 }
 
 
@@ -1944,15 +2081,18 @@ ubc_isinuse_locked(struct vnode *vp, int busycount, int locked)
        int retval = 0;
 
 
-       if (!locked)
+       if (!locked) {
                vnode_lock_spin(vp);
+       }
 
-       if ((vp->v_usecount - vp->v_kusecount) > busycount)
+       if ((vp->v_usecount - vp->v_kusecount) > busycount) {
                retval = 1;
+       }
 
-       if (!locked)
+       if (!locked) {
                vnode_unlock(vp);
-       return (retval);
+       }
+       return retval;
 }
 
 
@@ -1979,11 +2119,12 @@ __private_extern__ void
 ubc_unmap(struct vnode *vp)
 {
        struct ubc_info *uip;
-       int     need_rele = 0;
-       int     need_wakeup = 0;
+       int     need_rele = 0;
+       int     need_wakeup = 0;
 
-       if (vnode_getwithref(vp))
-               return;
+       if (vnode_getwithref(vp)) {
+               return;
+       }
 
        if (UBCINFOEXISTS(vp)) {
                bool want_fsevent = false;
@@ -1994,13 +2135,14 @@ ubc_unmap(struct vnode *vp)
                while (ISSET(uip->ui_flags, UI_MAPBUSY)) {
                        SET(uip->ui_flags, UI_MAPWAITING);
                        (void) msleep(&uip->ui_flags, &vp->v_lock,
-                                     PRIBIO, "ubc_unmap", NULL);
+                           PRIBIO, "ubc_unmap", NULL);
                }
                SET(uip->ui_flags, UI_MAPBUSY);
 
                if (ISSET(uip->ui_flags, UI_ISMAPPED)) {
-                       if (ISSET(uip->ui_flags, UI_MAPPEDWRITE))
+                       if (ISSET(uip->ui_flags, UI_MAPPEDWRITE)) {
                                want_fsevent = true;
+                       }
 
                        need_rele = 1;
 
@@ -2013,37 +2155,38 @@ ubc_unmap(struct vnode *vp)
                vnode_unlock(vp);
 
                if (need_rele) {
-                               vfs_context_t ctx = vfs_context_current();
+                       vfs_context_t ctx = vfs_context_current();
 
-                       (void)VNOP_MNOMAP(vp, ctx);
+                       (void)VNOP_MNOMAP(vp, ctx);
 
 #if CONFIG_FSE
-                               /*
-                                * Why do we want an fsevent here?  Normally the
-                                * content modified fsevent is posted when a file is
-                                * closed and only if it's written to via conventional
-                                * means.  It's perfectly legal to close a file and
-                                * keep your mappings and we don't currently track
-                                * whether it was written to via a mapping.
-                                * Therefore, we need to post an fsevent here if the
-                                * file was mapped writable.  This may result in false
-                                * events, i.e. we post a notification when nothing
-                                * has really changed.
-                                */
-                               if (want_fsevent && need_fsevent(FSE_CONTENT_MODIFIED, vp)) {
-                                       add_fsevent(FSE_CONTENT_MODIFIED, ctx,
-                                                               FSE_ARG_VNODE, vp,
-                                                               FSE_ARG_DONE);
-                               }
+                       /*
+                        * Why do we want an fsevent here?  Normally the
+                        * content modified fsevent is posted when a file is
+                        * closed and only if it's written to via conventional
+                        * means.  It's perfectly legal to close a file and
+                        * keep your mappings and we don't currently track
+                        * whether it was written to via a mapping.
+                        * Therefore, we need to post an fsevent here if the
+                        * file was mapped writable.  This may result in false
+                        * events, i.e. we post a notification when nothing
+                        * has really changed.
+                        */
+                       if (want_fsevent && need_fsevent(FSE_CONTENT_MODIFIED, vp)) {
+                               add_fsevent(FSE_CONTENT_MODIFIED, ctx,
+                                   FSE_ARG_VNODE, vp,
+                                   FSE_ARG_DONE);
+                       }
 #endif
 
-                       vnode_rele(vp);
+                       vnode_rele(vp);
                }
 
                vnode_lock_spin(vp);
 
-               if (need_rele)
+               if (need_rele) {
                        CLR(uip->ui_flags, UI_ISMAPPED | UI_MAPPEDWRITE);
+               }
 
                CLR(uip->ui_flags, UI_MAPBUSY);
 
@@ -2053,9 +2196,9 @@ ubc_unmap(struct vnode *vp)
                }
                vnode_unlock(vp);
 
-               if (need_wakeup)
-                       wakeup(&uip->ui_flags);
-
+               if (need_wakeup) {
+                       wakeup(&uip->ui_flags);
+               }
        }
        /*
         * the drop of the vnode ref will cleanup
@@ -2141,23 +2284,24 @@ ubc_unmap(struct vnode *vp)
  */
 kern_return_t
 ubc_page_op(
-       struct vnode    *vp,
-       off_t           f_offset,
-       int             ops,
-       ppnum_t *phys_entryp,
-       int             *flagsp)
+       struct vnode    *vp,
+       off_t           f_offset,
+       int             ops,
+       ppnum_t *phys_entryp,
+       int             *flagsp)
 {
-       memory_object_control_t         control;
+       memory_object_control_t         control;
 
        control = ubc_getobject(vp, UBC_FLAGS_NONE);
-       if (control == MEMORY_OBJECT_CONTROL_NULL)
+       if (control == MEMORY_OBJECT_CONTROL_NULL) {
                return KERN_INVALID_ARGUMENT;
+       }
 
-       return (memory_object_page_op(control,
-                                     (memory_object_offset_t)f_offset,
-                                     ops,
-                                     phys_entryp,
-                                     flagsp));
+       return memory_object_page_op(control,
+                  (memory_object_offset_t)f_offset,
+                  ops,
+                  phys_entryp,
+                  flagsp);
 }
 
 
@@ -2221,23 +2365,24 @@ ubc_page_op(
  */
 kern_return_t
 ubc_range_op(
-       struct vnode    *vp,
-       off_t           f_offset_beg,
-       off_t           f_offset_end,
+       struct vnode    *vp,
+       off_t           f_offset_beg,
+       off_t           f_offset_end,
        int             ops,
        int             *range)
 {
-       memory_object_control_t         control;
+       memory_object_control_t         control;
 
        control = ubc_getobject(vp, UBC_FLAGS_NONE);
-       if (control == MEMORY_OBJECT_CONTROL_NULL)
+       if (control == MEMORY_OBJECT_CONTROL_NULL) {
                return KERN_INVALID_ARGUMENT;
+       }
 
-       return (memory_object_range_op(control,
-                                     (memory_object_offset_t)f_offset_beg,
-                                     (memory_object_offset_t)f_offset_end,
-                                     ops,
-                                     range));
+       return memory_object_range_op(control,
+                  (memory_object_offset_t)f_offset_beg,
+                  (memory_object_offset_t)f_offset_end,
+                  ops,
+                  range);
 }
 
 
@@ -2263,12 +2408,12 @@ ubc_range_op(
  *                                     multiple of the page size
  *             KERN_INVALID_ARGUMENT   There is no ubc_info associated with
  *                                     the vnode, or there is no memory object
- *                                     control associated with the ubc_info 
+ *                                     control associated with the ubc_info
  *     memory_object_upl_request:KERN_INVALID_VALUE
  *                                     The supplied upl_flags argument is
  *                                     invalid
  * Implicit Returns:
- *             *uplp (modified)        
+ *             *uplp (modified)
  *             *plp (modified)         If non-NULL, the value of *plp will be
  *                                     modified to point to the internal page
  *                                     list; this modification may occur even
@@ -2280,47 +2425,62 @@ ubc_range_op(
  *             ubc_upl_abort(), or ubc_upl_abort_range().
  */
 kern_return_t
-ubc_create_upl(
-       struct vnode    *vp,
-       off_t           f_offset,
-       int             bufsize,
-       upl_t           *uplp,
-       upl_page_info_t **plp,
-       int             uplflags)
-{
-       memory_object_control_t         control;
-       kern_return_t                   kr;
-
-       if (plp != NULL)
+ubc_create_upl_external(
+       struct vnode    *vp,
+       off_t           f_offset,
+       int             bufsize,
+       upl_t           *uplp,
+       upl_page_info_t **plp,
+       int             uplflags)
+{
+       return ubc_create_upl_kernel(vp, f_offset, bufsize, uplp, plp, uplflags, vm_tag_bt());
+}
+
+kern_return_t
+ubc_create_upl_kernel(
+       struct vnode    *vp,
+       off_t           f_offset,
+       int             bufsize,
+       upl_t           *uplp,
+       upl_page_info_t **plp,
+       int             uplflags,
+       vm_tag_t tag)
+{
+       memory_object_control_t         control;
+       kern_return_t                   kr;
+
+       if (plp != NULL) {
                *plp = NULL;
+       }
        *uplp = NULL;
-       
-       if (bufsize & 0xfff)
+
+       if (bufsize & 0xfff) {
                return KERN_INVALID_ARGUMENT;
+       }
 
-       if (bufsize > MAX_UPL_SIZE_BYTES)
+       if (bufsize > MAX_UPL_SIZE_BYTES) {
                return KERN_INVALID_ARGUMENT;
+       }
 
        if (uplflags & (UPL_UBC_MSYNC | UPL_UBC_PAGEOUT | UPL_UBC_PAGEIN)) {
-
                if (uplflags & UPL_UBC_MSYNC) {
                        uplflags &= UPL_RET_ONLY_DIRTY;
 
                        uplflags |= UPL_COPYOUT_FROM | UPL_CLEAN_IN_PLACE |
-                                   UPL_SET_INTERNAL | UPL_SET_LITE;
-
+                           UPL_SET_INTERNAL | UPL_SET_LITE;
                } else if (uplflags & UPL_UBC_PAGEOUT) {
                        uplflags &= UPL_RET_ONLY_DIRTY;
 
-                       if (uplflags & UPL_RET_ONLY_DIRTY)
+                       if (uplflags & UPL_RET_ONLY_DIRTY) {
                                uplflags |= UPL_NOBLOCK;
+                       }
 
                        uplflags |= UPL_FOR_PAGEOUT | UPL_CLEAN_IN_PLACE |
-                                    UPL_COPYOUT_FROM | UPL_SET_INTERNAL | UPL_SET_LITE;
+                           UPL_COPYOUT_FROM | UPL_SET_INTERNAL | UPL_SET_LITE;
                } else {
                        uplflags |= UPL_RET_ONLY_ABSENT |
-                                   UPL_NO_SYNC | UPL_CLEAN_IN_PLACE |
-                                   UPL_SET_INTERNAL | UPL_SET_LITE;
+                           UPL_NO_SYNC | UPL_CLEAN_IN_PLACE |
+                           UPL_SET_INTERNAL | UPL_SET_LITE;
 
                        /*
                         * if the requested size == PAGE_SIZE, we don't want to set
@@ -2330,29 +2490,33 @@ ubc_create_upl(
                         * since we're only asking for a single page, we can block w/o fear
                         * of tying up pages while waiting for more to become available
                         */
-                       if (bufsize > PAGE_SIZE)
+                       if (bufsize > PAGE_SIZE) {
                                uplflags |= UPL_NOBLOCK;
+                       }
                }
        } else {
                uplflags &= ~UPL_FOR_PAGEOUT;
 
                if (uplflags & UPL_WILL_BE_DUMPED) {
                        uplflags &= ~UPL_WILL_BE_DUMPED;
-                       uplflags |= (UPL_NO_SYNC|UPL_SET_INTERNAL);
-               } else
-                       uplflags |= (UPL_NO_SYNC|UPL_CLEAN_IN_PLACE|UPL_SET_INTERNAL);
+                       uplflags |= (UPL_NO_SYNC | UPL_SET_INTERNAL);
+               } else {
+                       uplflags |= (UPL_NO_SYNC | UPL_CLEAN_IN_PLACE | UPL_SET_INTERNAL);
+               }
        }
        control = ubc_getobject(vp, UBC_FLAGS_NONE);
-       if (control == MEMORY_OBJECT_CONTROL_NULL)
+       if (control == MEMORY_OBJECT_CONTROL_NULL) {
                return KERN_INVALID_ARGUMENT;
+       }
 
-       kr = memory_object_upl_request(control, f_offset, bufsize, uplp, NULL, NULL, uplflags);
-       if (kr == KERN_SUCCESS && plp != NULL)
+       kr = memory_object_upl_request(control, f_offset, bufsize, uplp, NULL, NULL, uplflags, tag);
+       if (kr == KERN_SUCCESS && plp != NULL) {
                *plp = UPL_GET_INTERNAL_PAGE_LIST(*uplp);
+       }
        return kr;
 }
-               
-                                                             
+
+
 /*
  * ubc_upl_maxbufsize
  *
@@ -2362,11 +2526,11 @@ ubc_create_upl(
  *
  * Returns:    maximum size buffer (in bytes) ubc_create_upl( ) will take.
  */
-upl_size_t 
+upl_size_t
 ubc_upl_maxbufsize(
        void)
 {
-       return(MAX_UPL_SIZE_BYTES);
+       return MAX_UPL_SIZE_BYTES;
 }
 
 /*
@@ -2388,10 +2552,10 @@ ubc_upl_maxbufsize(
  */
 kern_return_t
 ubc_upl_map(
-       upl_t           upl,
-       vm_offset_t     *dst_addr)
+       upl_t           upl,
+       vm_offset_t     *dst_addr)
 {
-       return (vm_upl_map(kernel_map, upl, dst_addr));
+       return vm_upl_map(kernel_map, upl, dst_addr);
 }
 
 
@@ -2409,9 +2573,9 @@ ubc_upl_map(
  */
 kern_return_t
 ubc_upl_unmap(
-       upl_t   upl)
+       upl_t   upl)
 {
-       return(vm_upl_unmap(kernel_map, upl));
+       return vm_upl_unmap(kernel_map, upl);
 }
 
 
@@ -2440,10 +2604,10 @@ ubc_upl_unmap(
  */
 kern_return_t
 ubc_upl_commit(
-       upl_t                   upl)
+       upl_t                   upl)
 {
-       upl_page_info_t *pl;
-       kern_return_t   kr;
+       upl_page_info_t *pl;
+       kern_return_t   kr;
 
        pl = UPL_GET_INTERNAL_PAGE_LIST(upl);
        kr = upl_commit(upl, pl, MAX_UPL_SIZE_BYTES >> PAGE_SHIFT);
@@ -2506,17 +2670,18 @@ ubc_upl_commit(
  */
 kern_return_t
 ubc_upl_commit_range(
-       upl_t                   upl,
-       upl_offset_t            offset,
-       upl_size_t              size,
-       int                             flags)
+       upl_t                   upl,
+       upl_offset_t            offset,
+       upl_size_t              size,
+       int                             flags)
 {
-       upl_page_info_t *pl;
-       boolean_t               empty;
-       kern_return_t   kr;
+       upl_page_info_t *pl;
+       boolean_t               empty;
+       kern_return_t   kr;
 
-       if (flags & UPL_COMMIT_FREE_ON_EMPTY)
+       if (flags & UPL_COMMIT_FREE_ON_EMPTY) {
                flags |= UPL_COMMIT_NOTIFY_EMPTY;
+       }
 
        if (flags & UPL_COMMIT_KERNEL_ONLY_FLAGS) {
                return KERN_INVALID_ARGUMENT;
@@ -2525,10 +2690,11 @@ ubc_upl_commit_range(
        pl = UPL_GET_INTERNAL_PAGE_LIST(upl);
 
        kr = upl_commit_range(upl, offset, size, flags,
-                             pl, MAX_UPL_SIZE_BYTES >> PAGE_SHIFT, &empty);
+           pl, MAX_UPL_SIZE_BYTES >> PAGE_SHIFT, &empty);
 
-       if((flags & UPL_COMMIT_FREE_ON_EMPTY) && empty)
+       if ((flags & UPL_COMMIT_FREE_ON_EMPTY) && empty) {
                upl_deallocate(upl);
+       }
 
        return kr;
 }
@@ -2581,21 +2747,23 @@ ubc_upl_commit_range(
  */
 kern_return_t
 ubc_upl_abort_range(
-       upl_t                   upl,
-       upl_offset_t            offset,
-       upl_size_t              size,
-       int                             abort_flags)
+       upl_t                   upl,
+       upl_offset_t            offset,
+       upl_size_t              size,
+       int                             abort_flags)
 {
-       kern_return_t   kr;
-       boolean_t               empty = FALSE;
+       kern_return_t   kr;
+       boolean_t               empty = FALSE;
 
-       if (abort_flags & UPL_ABORT_FREE_ON_EMPTY)
+       if (abort_flags & UPL_ABORT_FREE_ON_EMPTY) {
                abort_flags |= UPL_ABORT_NOTIFY_EMPTY;
+       }
 
        kr = upl_abort_range(upl, offset, size, abort_flags, &empty);
 
-       if((abort_flags & UPL_ABORT_FREE_ON_EMPTY) && empty)
+       if ((abort_flags & UPL_ABORT_FREE_ON_EMPTY) && empty) {
                upl_deallocate(upl);
+       }
 
        return kr;
 }
@@ -2645,10 +2813,10 @@ ubc_upl_abort_range(
  */
 kern_return_t
 ubc_upl_abort(
-       upl_t                   upl,
-       int                             abort_type)
+       upl_t                   upl,
+       int                             abort_type)
 {
-       kern_return_t   kr;
+       kern_return_t   kr;
 
        kr = upl_abort(upl, abort_type);
        upl_deallocate(upl);
@@ -2676,38 +2844,42 @@ ubc_upl_abort(
  */
 upl_page_info_t *
 ubc_upl_pageinfo(
-       upl_t                   upl)
-{             
-       return (UPL_GET_INTERNAL_PAGE_LIST(upl));
+       upl_t                   upl)
+{
+       return UPL_GET_INTERNAL_PAGE_LIST(upl);
 }
 
 
-int 
+int
 UBCINFOEXISTS(const struct vnode * vp)
 {
-        return((vp) && ((vp)->v_type == VREG) && ((vp)->v_ubcinfo != UBC_INFO_NULL));
+       return (vp) && ((vp)->v_type == VREG) && ((vp)->v_ubcinfo != UBC_INFO_NULL);
 }
 
 
 void
 ubc_upl_range_needed(
-       upl_t           upl,
-       int             index,
-       int             count)
+       upl_t           upl,
+       int             index,
+       int             count)
 {
        upl_range_needed(upl, index, count);
 }
 
-boolean_t ubc_is_mapped(const struct vnode *vp, boolean_t *writable)
+boolean_t
+ubc_is_mapped(const struct vnode *vp, boolean_t *writable)
 {
-       if (!UBCINFOEXISTS(vp) || !ISSET(vp->v_ubcinfo->ui_flags, UI_ISMAPPED))
+       if (!UBCINFOEXISTS(vp) || !ISSET(vp->v_ubcinfo->ui_flags, UI_ISMAPPED)) {
                return FALSE;
-       if (writable)
+       }
+       if (writable) {
                *writable = ISSET(vp->v_ubcinfo->ui_flags, UI_MAPPEDWRITE);
+       }
        return TRUE;
 }
 
-boolean_t ubc_is_mapped_writable(const struct vnode *vp)
+boolean_t
+ubc_is_mapped_writable(const struct vnode *vp)
 {
        boolean_t writable;
        return ubc_is_mapped(vp, &writable) && writable;
@@ -2717,318 +2889,754 @@ boolean_t ubc_is_mapped_writable(const struct vnode *vp)
 /*
  * CODE SIGNING
  */
-#define CS_BLOB_PAGEABLE 0
-static volatile SInt32 cs_blob_size = 0;
-static volatile SInt32 cs_blob_count = 0;
-static SInt32 cs_blob_size_peak = 0;
-static UInt32 cs_blob_size_max = 0;
-static SInt32 cs_blob_count_peak = 0;
+static atomic_size_t cs_blob_size = 0;
+static atomic_uint_fast32_t cs_blob_count = 0;
+static atomic_size_t cs_blob_size_peak = 0;
+static atomic_size_t cs_blob_size_max = 0;
+static atomic_uint_fast32_t cs_blob_count_peak = 0;
+
+SYSCTL_UINT(_vm, OID_AUTO, cs_blob_count, CTLFLAG_RD | CTLFLAG_LOCKED, &cs_blob_count, 0, "Current number of code signature blobs");
+SYSCTL_ULONG(_vm, OID_AUTO, cs_blob_size, CTLFLAG_RD | CTLFLAG_LOCKED, &cs_blob_size, "Current size of all code signature blobs");
+SYSCTL_UINT(_vm, OID_AUTO, cs_blob_count_peak, CTLFLAG_RD | CTLFLAG_LOCKED, &cs_blob_count_peak, 0, "Peak number of code signature blobs");
+SYSCTL_ULONG(_vm, OID_AUTO, cs_blob_size_peak, CTLFLAG_RD | CTLFLAG_LOCKED, &cs_blob_size_peak, "Peak size of code signature blobs");
+SYSCTL_ULONG(_vm, OID_AUTO, cs_blob_size_max, CTLFLAG_RD | CTLFLAG_LOCKED, &cs_blob_size_max, "Size of biggest code signature blob");
 
-int cs_validation = 1;
+/*
+ * Function: csblob_parse_teamid
+ *
+ * Description: This function returns a pointer to the team id
+ *               stored within the codedirectory of the csblob.
+ *               If the codedirectory predates team-ids, it returns
+ *               NULL.
+ *               This does not copy the name but returns a pointer to
+ *               it within the CD. Subsequently, the CD must be
+ *               available when this is used.
+ */
 
-#ifndef SECURE_KERNEL
-SYSCTL_INT(_vm, OID_AUTO, cs_validation, CTLFLAG_RW | CTLFLAG_LOCKED, &cs_validation, 0, "Do validate code signatures");
-#endif
-SYSCTL_INT(_vm, OID_AUTO, cs_blob_count, CTLFLAG_RD | CTLFLAG_LOCKED, (int *)(uintptr_t)&cs_blob_count, 0, "Current number of code signature blobs");
-SYSCTL_INT(_vm, OID_AUTO, cs_blob_size, CTLFLAG_RD | CTLFLAG_LOCKED, (int *)(uintptr_t)&cs_blob_size, 0, "Current size of all code signature blobs");
-SYSCTL_INT(_vm, OID_AUTO, cs_blob_count_peak, CTLFLAG_RD | CTLFLAG_LOCKED, &cs_blob_count_peak, 0, "Peak number of code signature blobs");
-SYSCTL_INT(_vm, OID_AUTO, cs_blob_size_peak, CTLFLAG_RD | CTLFLAG_LOCKED, &cs_blob_size_peak, 0, "Peak size of code signature blobs");
-SYSCTL_INT(_vm, OID_AUTO, cs_blob_size_max, CTLFLAG_RD | CTLFLAG_LOCKED, &cs_blob_size_max, 0, "Size of biggest code signature blob");
+static const char *
+csblob_parse_teamid(struct cs_blob *csblob)
+{
+       const CS_CodeDirectory *cd;
+
+       cd = csblob->csb_cd;
+
+       if (ntohl(cd->version) < CS_SUPPORTSTEAMID) {
+               return NULL;
+       }
+
+       if (cd->teamOffset == 0) {
+               return NULL;
+       }
+
+       const char *name = ((const char *)cd) + ntohl(cd->teamOffset);
+       if (cs_debug > 1) {
+               printf("found team-id %s in cdblob\n", name);
+       }
+
+       return name;
+}
 
 
 kern_return_t
 ubc_cs_blob_allocate(
-       vm_offset_t     *blob_addr_p,
-       vm_size_t       *blob_size_p)
-{
-       kern_return_t   kr;
-
-#if CS_BLOB_PAGEABLE
-       *blob_size_p = round_page(*blob_size_p);
-       kr = kmem_alloc(kernel_map, blob_addr_p, *blob_size_p);
-#else  /* CS_BLOB_PAGEABLE */
-       *blob_addr_p = (vm_offset_t) kalloc(*blob_size_p);
-       if (*blob_addr_p == 0) {
-               kr = KERN_NO_SPACE;
-       } else {
-               kr = KERN_SUCCESS;
+       vm_offset_t     *blob_addr_p,
+       vm_size_t       *blob_size_p)
+{
+       kern_return_t   kr = KERN_FAILURE;
+
+       {
+               *blob_addr_p = (vm_offset_t) kalloc_tag(*blob_size_p, VM_KERN_MEMORY_SECURITY);
+
+               if (*blob_addr_p == 0) {
+                       kr = KERN_NO_SPACE;
+               } else {
+                       kr = KERN_SUCCESS;
+               }
        }
-#endif /* CS_BLOB_PAGEABLE */
+
        return kr;
 }
 
 void
 ubc_cs_blob_deallocate(
-       vm_offset_t     blob_addr,
-       vm_size_t       blob_size)
+       vm_offset_t     blob_addr,
+       vm_size_t       blob_size)
 {
-#if CS_BLOB_PAGEABLE
-       kmem_free(kernel_map, blob_addr, blob_size);
-#else  /* CS_BLOB_PAGEABLE */
-       kfree((void *) blob_addr, blob_size);
-#endif /* CS_BLOB_PAGEABLE */
+       {
+               kfree(blob_addr, blob_size);
+       }
 }
-       
-int
-ubc_cs_sigpup_add(
-       struct vnode    *vp,
-       vm_address_t    address,
-       vm_size_t       size)
-{
-       kern_return_t           kr;
-       struct ubc_info         *uip;
-       struct cs_blob          *blob;
-       memory_object_control_t control;
+
+/*
+ * Some codesigned files use a lowest common denominator page size of
+ * 4KiB, but can be used on systems that have a runtime page size of
+ * 16KiB. Since faults will only occur on 16KiB ranges in
+ * cs_validate_range(), we can convert the original Code Directory to
+ * a multi-level scheme where groups of 4 hashes are combined to form
+ * a new hash, which represents 16KiB in the on-disk file.  This can
+ * reduce the wired memory requirement for the Code Directory by
+ * 75%. Care must be taken for binaries that use the "fourk" VM pager
+ * for unaligned access, which may still attempt to validate on
+ * non-16KiB multiples for compatibility with 3rd party binaries.
+ */
+static boolean_t
+ubc_cs_supports_multilevel_hash(struct cs_blob *blob __unused)
+{
        const CS_CodeDirectory *cd;
-       int                     error;
 
-       control = ubc_getobject(vp, UBC_FLAGS_NONE);
-       if (control == MEMORY_OBJECT_CONTROL_NULL)
-               return KERN_INVALID_ARGUMENT;
 
-       if (memory_object_is_signed(control))
-               return 0;
+       /*
+        * Only applies to binaries that ship as part of the OS,
+        * primarily the shared cache.
+        */
+       if (!blob->csb_platform_binary || blob->csb_teamid != NULL) {
+               return FALSE;
+       }
 
-       blob = (struct cs_blob *) kalloc(sizeof (struct cs_blob));
-       if (blob == NULL)
-               return ENOMEM;
+       /*
+        * If the runtime page size matches the code signing page
+        * size, there is no work to do.
+        */
+       if (PAGE_SHIFT <= blob->csb_hash_pageshift) {
+               return FALSE;
+       }
+
+       cd = blob->csb_cd;
 
-       /* fill in the new blob */
-       blob->csb_cpu_type = CPU_TYPE_ANY;
-       blob->csb_base_offset = 0;
-       blob->csb_mem_size = size;
-       blob->csb_mem_offset = 0;
-       blob->csb_mem_handle = IPC_PORT_NULL;
-       blob->csb_mem_kaddr = address;
-       blob->csb_sigpup = 1;
-       blob->csb_platform_binary = 0;
-       blob->csb_teamid = NULL;
-       
        /*
-        * Validate the blob's contents
+        * There must be a valid integral multiple of hashes
         */
-       cd = findCodeDirectory(
-               (const CS_SuperBlob *) address, 
-               (char *) address, 
-               (char *) address + blob->csb_mem_size);
-       if (cd == NULL) {
-               /* no code directory => useless blob ! */
-               error = EINVAL;
-               goto out;
+       if (ntohl(cd->nCodeSlots) & (PAGE_MASK >> blob->csb_hash_pageshift)) {
+               return FALSE;
        }
 
-       blob->csb_flags = ntohl(cd->flags) | CS_VALID;
-       blob->csb_end_offset = round_page_4K(ntohl(cd->codeLimit));
-       if((ntohl(cd->version) >= CS_SUPPORTSSCATTER) && (ntohl(cd->scatterOffset))) {
+       /*
+        * Scatter lists must also have ranges that have an integral number of hashes
+        */
+       if ((ntohl(cd->version) >= CS_SUPPORTSSCATTER) && (ntohl(cd->scatterOffset))) {
                const SC_Scatter *scatter = (const SC_Scatter*)
                    ((const char*)cd + ntohl(cd->scatterOffset));
-               blob->csb_start_offset = ntohl(scatter->base) * PAGE_SIZE_4K;
-       } else {
-               blob->csb_start_offset = (blob->csb_end_offset - (ntohl(cd->nCodeSlots) * PAGE_SIZE_4K));
-       }
+               /* iterate all scatter structs to make sure they are all aligned */
+               do {
+                       uint32_t sbase = ntohl(scatter->base);
+                       uint32_t scount = ntohl(scatter->count);
 
-       /* 
-        * We don't need to check with the policy module, since the input data is supposed to be already checked
-        */
-       
-       vnode_lock(vp);
-       if (! UBCINFOEXISTS(vp)) {
-               vnode_unlock(vp);
-               if (cs_debug)
-                       printf("out ubc object\n");
-               error = ENOENT;
-               goto out;
+                       /* last scatter? */
+                       if (scount == 0) {
+                               break;
+                       }
+
+                       if (sbase & (PAGE_MASK >> blob->csb_hash_pageshift)) {
+                               return FALSE;
+                       }
+
+                       if (scount & (PAGE_MASK >> blob->csb_hash_pageshift)) {
+                               return FALSE;
+                       }
+
+                       scatter++;
+               } while (1);
        }
-       uip = vp->v_ubcinfo;
 
-       /* someone raced us to adding the code directory */
-       if (uip->cs_blobs != NULL) {
-               if (cs_debug)
-                       printf("sigpup: vnode already have CD ?\n");
-               vnode_unlock(vp);
-               error = EEXIST;
-               goto out;
+       /* Covered range must be a multiple of the new page size */
+       if (ntohl(cd->codeLimit) & PAGE_MASK) {
+               return FALSE;
        }
 
-       blob->csb_next = uip->cs_blobs;
-       uip->cs_blobs = blob;
+       /* All checks pass */
+       return TRUE;
+}
 
-       OSAddAtomic(+1, &cs_blob_count);
-       OSAddAtomic((SInt32) +blob->csb_mem_size, &cs_blob_size);
+/*
+ * Given a cs_blob with an already chosen best code directory, this
+ * function allocates memory and copies into it only the blobs that
+ * will be needed by the kernel, namely the single chosen code
+ * directory (and not any of its alternatives) and the entitlement
+ * blob.
+ *
+ * This saves significant memory with agile signatures, and additional
+ * memory for 3rd Party Code because we also omit the CMS blob.
+ *
+ * To support multilevel and other potential code directory rewriting,
+ * the size of a new code directory can be specified. Since that code
+ * directory will replace the existing code directory,
+ * ubc_cs_reconstitute_code_signature does not copy the original code
+ * directory when a size is given, and the caller must fill it in.
+ */
+static int
+ubc_cs_reconstitute_code_signature(struct cs_blob const *blob, vm_size_t optional_new_cd_size,
+    vm_address_t *new_blob_addr_p, vm_size_t *new_blob_size_p,
+    CS_CodeDirectory **new_cd_p, CS_GenericBlob const **new_entitlements_p)
+{
+       const CS_CodeDirectory  *old_cd, *cd;
+       CS_CodeDirectory        *new_cd;
+       const CS_GenericBlob *entitlements;
+       vm_offset_t     new_blob_addr;
+       vm_size_t       new_blob_size;
+       vm_size_t       new_cdsize;
+       kern_return_t   kr;
+       int                             error;
+
+       old_cd = blob->csb_cd;
+
+       new_cdsize = optional_new_cd_size != 0 ? optional_new_cd_size : htonl(old_cd->length);
+
+       new_blob_size  = sizeof(CS_SuperBlob);
+       new_blob_size += sizeof(CS_BlobIndex);
+       new_blob_size += new_cdsize;
+
+       if (blob->csb_entitlements_blob) {
+               /* We need to add a slot for the entitlements */
+               ptrauth_utils_auth_blob_generic(blob->csb_entitlements_blob,
+                   ntohl(blob->csb_entitlements_blob->length),
+                   OS_PTRAUTH_DISCRIMINATOR("cs_blob.csb_entitlements_blob_signature"),
+                   PTRAUTH_ADDR_DIVERSIFY,
+                   blob->csb_entitlements_blob_signature);
+
+               new_blob_size += sizeof(CS_BlobIndex);
+               new_blob_size += ntohl(blob->csb_entitlements_blob->length);
+       }
 
-       /* mark this vnode's VM object as having "signed pages" */
-       kr = memory_object_signed(uip->ui_control, TRUE);
+       kr = ubc_cs_blob_allocate(&new_blob_addr, &new_blob_size);
        if (kr != KERN_SUCCESS) {
-               vnode_unlock(vp);
-               if (cs_debug)
-                       printf("sigpup: not signable ?\n");
-               error = ENOENT;
-               goto out;
+               if (cs_debug > 1) {
+                       printf("CODE SIGNING: Failed to allocate memory for new Code Signing Blob: %d\n",
+                           kr);
+               }
+               return ENOMEM;
        }
 
-       vnode_unlock(vp);
+       CS_SuperBlob            *new_superblob;
 
-       error = 0;
-out:
-       if (error) {
-               if (cs_debug)
-                       printf("sigpup: not signable ?\n");
-               /* we failed; release what we allocated */
-               if (blob) {
-                       kfree(blob, sizeof (*blob));
-                       blob = NULL;
-               }
-       }
+       new_superblob = (CS_SuperBlob *)new_blob_addr;
+       new_superblob->magic = htonl(CSMAGIC_EMBEDDED_SIGNATURE);
+       new_superblob->length = htonl((uint32_t)new_blob_size);
+       if (blob->csb_entitlements_blob) {
+               vm_size_t                       ent_offset, cd_offset;
 
-       return error;
-}
+               cd_offset  = sizeof(CS_SuperBlob) + 2 * sizeof(CS_BlobIndex);
+               ent_offset = cd_offset +  new_cdsize;
 
-int
-ubc_cs_blob_add(
-       struct vnode    *vp,
-       cpu_type_t      cputype,
-       off_t           base_offset,
-       vm_address_t    addr,
-       vm_size_t       size)
-{
-       kern_return_t           kr;
-       struct ubc_info         *uip;
-       struct cs_blob          *blob, *oblob;
-       int                     error;
-       ipc_port_t              blob_handle;
-       memory_object_size_t    blob_size;
-       const CS_CodeDirectory *cd;
-       off_t                   blob_start_offset, blob_end_offset;
-       SHA1_CTX                sha1ctxt;
-       boolean_t               record_mtime;
-       int                     is_platform_binary;
+               new_superblob->count = htonl(2);
+               new_superblob->index[0].type = htonl(CSSLOT_CODEDIRECTORY);
+               new_superblob->index[0].offset = htonl((uint32_t)cd_offset);
+               new_superblob->index[1].type = htonl(CSSLOT_ENTITLEMENTS);
+               new_superblob->index[1].offset = htonl((uint32_t)ent_offset);
 
-       record_mtime = FALSE;
-       is_platform_binary = 0;
+               ptrauth_utils_auth_blob_generic(blob->csb_entitlements_blob,
+                   ntohl(blob->csb_entitlements_blob->length),
+                   OS_PTRAUTH_DISCRIMINATOR("cs_blob.csb_entitlements_blob_signature"),
+                   PTRAUTH_ADDR_DIVERSIFY,
+                   blob->csb_entitlements_blob_signature);
 
-       blob_handle = IPC_PORT_NULL;
+               memcpy((void *)(new_blob_addr + ent_offset), blob->csb_entitlements_blob, ntohl(blob->csb_entitlements_blob->length));
 
-       blob = (struct cs_blob *) kalloc(sizeof (struct cs_blob));
-       if (blob == NULL) {
-               return ENOMEM;
+               new_cd = (CS_CodeDirectory *)(new_blob_addr + cd_offset);
+       } else {
+               // Blob is the code directory, directly.
+               new_cd = (CS_CodeDirectory *)new_blob_addr;
        }
 
-#if CS_BLOB_PAGEABLE
-       /* get a memory entry on the blob */
-       blob_size = (memory_object_size_t) size;
-       kr = mach_make_memory_entry_64(kernel_map,
-                                      &blob_size,
-                                      addr,
-                                      VM_PROT_READ,
-                                      &blob_handle,
-                                      IPC_PORT_NULL);
-       if (kr != KERN_SUCCESS) {
-               error = ENOMEM;
-               goto out;
-       }
-       if (memory_object_round_page(blob_size) !=
-           (memory_object_size_t) round_page(size)) {
-               printf("ubc_cs_blob_add: size mismatch 0x%llx 0x%lx !?\n",
-                      blob_size, (size_t)size);
-               panic("XXX FBDP size mismatch 0x%llx 0x%lx\n", blob_size, (size_t)size);
-               error = EINVAL;
-               goto out;
-       }
-#else
-       blob_size = (memory_object_size_t) size;
-       blob_handle = IPC_PORT_NULL;
-#endif
+       if (optional_new_cd_size == 0) {
+               // Copy code directory, and revalidate.
+               memcpy(new_cd, old_cd, new_cdsize);
 
-       /* fill in the new blob */
-       blob->csb_cpu_type = cputype;
-       blob->csb_sigpup = 0;
-       blob->csb_base_offset = base_offset;
-       blob->csb_mem_size = size;
-       blob->csb_mem_offset = 0;
-       blob->csb_mem_handle = blob_handle;
-       blob->csb_mem_kaddr = addr;
-       blob->csb_flags = 0;
-       blob->csb_platform_binary = 0;
-       blob->csb_teamid = NULL;
-       
-       /*
-        * Validate the blob's contents
-        */
+               vm_size_t length = new_blob_size;
 
-       error = cs_validate_csblob((const uint8_t *)addr, size, &cd);
-       if (error) {
-               if (cs_debug)
-                       printf("CODESIGNING: csblob invalid: %d\n", error);
-               blob->csb_flags = 0;
-               blob->csb_start_offset = 0;
-               blob->csb_end_offset = 0;
-               memset(blob->csb_sha1, 0, SHA1_RESULTLEN);
-               /* let the vnode checker determine if the signature is valid or not */
-       } else {
-               const unsigned char *sha1_base;
-               int sha1_size;
+               error = cs_validate_csblob((const uint8_t *)new_blob_addr, length, &cd, &entitlements);
 
-               blob->csb_flags = (ntohl(cd->flags) & CS_ALLOWED_MACHO) | CS_VALID;
-               blob->csb_end_offset = round_page_4K(ntohl(cd->codeLimit));
-               if((ntohl(cd->version) >= CS_SUPPORTSSCATTER) && (ntohl(cd->scatterOffset))) {
-                       const SC_Scatter *scatter = (const SC_Scatter*)
-                               ((const char*)cd + ntohl(cd->scatterOffset));
-                       blob->csb_start_offset = ntohl(scatter->base) * PAGE_SIZE_4K;
-               } else {
-                       blob->csb_start_offset = (blob->csb_end_offset -
-                                                 (ntohl(cd->nCodeSlots) * PAGE_SIZE_4K));
-               }
-               /* compute the blob's SHA1 hash */
-               sha1_base = (const unsigned char *) cd;
-               sha1_size = ntohl(cd->length);
-               SHA1Init(&sha1ctxt);
-               SHA1Update(&sha1ctxt, sha1_base, sha1_size);
-               SHA1Final(blob->csb_sha1, &sha1ctxt);
-       }
+               if (error) {
+                       printf("CODE SIGNING: Failed to validate new Code Signing Blob: %d\n",
+                           error);
 
-       /* 
-        * Let policy module check whether the blob's signature is accepted.
-        */
-#if CONFIG_MACF
-       error = mac_vnode_check_signature(vp, base_offset, blob->csb_sha1, (const void*)cd, size, &is_platform_binary);
-       if (error) {
-               if (cs_debug) 
-                       printf("check_signature[pid: %d], error = %d\n", current_proc()->p_pid, error);
-               goto out;
-       }
-#endif 
-       
-       if (is_platform_binary) {
-               if (cs_debug > 1)
-                       printf("check_signature[pid: %d]: platform binary\n", current_proc()->p_pid);
-               blob->csb_platform_binary = 1;
-       } else {
-               blob->csb_platform_binary = 0;
-               blob->csb_teamid = csblob_get_teamid(blob);
-               if (cs_debug > 1) {
-                       if (blob->csb_teamid)
-                               printf("check_signature[pid: %d]: team-id is %s\n", current_proc()->p_pid, blob->csb_teamid);
-                       else
-                               printf("check_signature[pid: %d]: no team-id\n", current_proc()->p_pid);
+                       ubc_cs_blob_deallocate(new_blob_addr, new_blob_size);
+                       return error;
                }
+               *new_entitlements_p = entitlements;
+       } else {
+               // Caller will fill out and validate code directory.
+               memset(new_cd, 0, new_cdsize);
+               *new_entitlements_p = NULL;
        }
-       
-       /*
-        * Validate the blob's coverage
-        */
-       blob_start_offset = blob->csb_base_offset + blob->csb_start_offset;
-       blob_end_offset = blob->csb_base_offset + blob->csb_end_offset;
 
-       if (blob_start_offset >= blob_end_offset ||
-           blob_start_offset < 0 ||
+       *new_blob_addr_p = new_blob_addr;
+       *new_blob_size_p = new_blob_size;
+       *new_cd_p = new_cd;
+
+       return 0;
+}
+
+static int
+ubc_cs_convert_to_multilevel_hash(struct cs_blob *blob)
+{
+       const CS_CodeDirectory  *old_cd, *cd;
+       CS_CodeDirectory        *new_cd;
+       const CS_GenericBlob *entitlements;
+       vm_offset_t     new_blob_addr;
+       vm_size_t       new_blob_size;
+       vm_size_t       new_cdsize;
+       int                             error;
+
+       uint32_t                hashes_per_new_hash_shift = (uint32_t)(PAGE_SHIFT - blob->csb_hash_pageshift);
+
+       if (cs_debug > 1) {
+               printf("CODE SIGNING: Attempting to convert Code Directory for %lu -> %lu page shift\n",
+                   (unsigned long)blob->csb_hash_pageshift, (unsigned long)PAGE_SHIFT);
+       }
+
+       old_cd = blob->csb_cd;
+
+       /* Up to the hashes, we can copy all data */
+       new_cdsize  = ntohl(old_cd->hashOffset);
+       new_cdsize += (ntohl(old_cd->nCodeSlots) >> hashes_per_new_hash_shift) * old_cd->hashSize;
+
+       error = ubc_cs_reconstitute_code_signature(blob, new_cdsize,
+           &new_blob_addr, &new_blob_size, &new_cd,
+           &entitlements);
+       if (error != 0) {
+               printf("CODE SIGNING: Failed to reconsitute code signature: %d\n", error);
+               return error;
+       }
+
+       memcpy(new_cd, old_cd, ntohl(old_cd->hashOffset));
+
+       /* Update fields in the Code Directory structure */
+       new_cd->length = htonl((uint32_t)new_cdsize);
+
+       uint32_t nCodeSlots = ntohl(new_cd->nCodeSlots);
+       nCodeSlots >>= hashes_per_new_hash_shift;
+       new_cd->nCodeSlots = htonl(nCodeSlots);
+
+       new_cd->pageSize = (uint8_t)PAGE_SHIFT; /* Not byte-swapped */
+
+       if ((ntohl(new_cd->version) >= CS_SUPPORTSSCATTER) && (ntohl(new_cd->scatterOffset))) {
+               SC_Scatter *scatter = (SC_Scatter*)
+                   ((char *)new_cd + ntohl(new_cd->scatterOffset));
+               /* iterate all scatter structs to scale their counts */
+               do {
+                       uint32_t scount = ntohl(scatter->count);
+                       uint32_t sbase  = ntohl(scatter->base);
+
+                       /* last scatter? */
+                       if (scount == 0) {
+                               break;
+                       }
+
+                       scount >>= hashes_per_new_hash_shift;
+                       scatter->count = htonl(scount);
+
+                       sbase >>= hashes_per_new_hash_shift;
+                       scatter->base = htonl(sbase);
+
+                       scatter++;
+               } while (1);
+       }
+
+       /* For each group of hashes, hash them together */
+       const unsigned char *src_base = (const unsigned char *)old_cd + ntohl(old_cd->hashOffset);
+       unsigned char *dst_base = (unsigned char *)new_cd + ntohl(new_cd->hashOffset);
+
+       uint32_t hash_index;
+       for (hash_index = 0; hash_index < nCodeSlots; hash_index++) {
+               union cs_hash_union     mdctx;
+
+               uint32_t source_hash_len = old_cd->hashSize << hashes_per_new_hash_shift;
+               const unsigned char *src = src_base + hash_index * source_hash_len;
+               unsigned char *dst = dst_base + hash_index * new_cd->hashSize;
+
+               blob->csb_hashtype->cs_init(&mdctx);
+               blob->csb_hashtype->cs_update(&mdctx, src, source_hash_len);
+               blob->csb_hashtype->cs_final(dst, &mdctx);
+       }
+
+       error = cs_validate_csblob((const uint8_t *)new_blob_addr, new_blob_size, &cd, &entitlements);
+       if (error != 0) {
+               printf("CODE SIGNING: Failed to validate new Code Signing Blob: %d\n",
+                   error);
+
+               ubc_cs_blob_deallocate(new_blob_addr, new_blob_size);
+               return error;
+       }
+
+       /* New Code Directory is ready for use, swap it out in the blob structure */
+       ubc_cs_blob_deallocate((vm_offset_t)blob->csb_mem_kaddr, blob->csb_mem_size);
+
+       blob->csb_mem_size = new_blob_size;
+       blob->csb_mem_kaddr = (void *)new_blob_addr;
+       blob->csb_cd = cd;
+       blob->csb_entitlements_blob = entitlements;
+       if (blob->csb_entitlements_blob != NULL) {
+               blob->csb_entitlements_blob_signature = ptrauth_utils_sign_blob_generic(blob->csb_entitlements_blob,
+                   ntohl(blob->csb_entitlements_blob->length),
+                   OS_PTRAUTH_DISCRIMINATOR("cs_blob.csb_entitlements_blob_signature"),
+                   PTRAUTH_ADDR_DIVERSIFY);
+       }
+
+       /* The blob has some cached attributes of the Code Directory, so update those */
+
+       blob->csb_hash_firstlevel_pageshift = blob->csb_hash_pageshift; /* Save the original page size */
+
+       blob->csb_hash_pageshift = PAGE_SHIFT;
+       blob->csb_end_offset = ntohl(cd->codeLimit);
+       if ((ntohl(cd->version) >= CS_SUPPORTSSCATTER) && (ntohl(cd->scatterOffset))) {
+               const SC_Scatter *scatter = (const SC_Scatter*)
+                   ((const char*)cd + ntohl(cd->scatterOffset));
+               blob->csb_start_offset = ((off_t)ntohl(scatter->base)) * PAGE_SIZE;
+       } else {
+               blob->csb_start_offset = 0;
+       }
+
+       return 0;
+}
+
+/*
+ * Validate the code signature blob, create a struct cs_blob wrapper
+ * and return it together with a pointer to the chosen code directory
+ * and entitlements blob.
+ *
+ * Note that this takes ownership of the memory as addr, mainly because
+ * this function can actually replace the passed in blob with another
+ * one, e.g. when performing multilevel hashing optimization.
+ */
+int
+cs_blob_create_validated(
+       vm_address_t * const            addr,
+       vm_size_t                       size,
+       struct cs_blob ** const         ret_blob,
+       CS_CodeDirectory const ** const     ret_cd)
+{
+       struct cs_blob          *blob;
+       int             error = EINVAL;
+       const CS_CodeDirectory *cd;
+       const CS_GenericBlob *entitlements;
+       union cs_hash_union     mdctx;
+       size_t                  length;
+
+       if (ret_blob) {
+               *ret_blob = NULL;
+       }
+
+       blob = (struct cs_blob *) kalloc(sizeof(struct cs_blob));
+       if (blob == NULL) {
+               return ENOMEM;
+       }
+
+       /* fill in the new blob */
+       blob->csb_mem_size = size;
+       blob->csb_mem_offset = 0;
+       blob->csb_mem_kaddr = (void *)*addr;
+       blob->csb_flags = 0;
+       blob->csb_signer_type = CS_SIGNER_TYPE_UNKNOWN;
+       blob->csb_platform_binary = 0;
+       blob->csb_platform_path = 0;
+       blob->csb_teamid = NULL;
+#if CONFIG_SUPPLEMENTAL_SIGNATURES
+       blob->csb_supplement_teamid = NULL;
+#endif
+       blob->csb_entitlements_blob = NULL;
+       blob->csb_entitlements = NULL;
+       blob->csb_reconstituted = false;
+
+       /* Transfer ownership. Even on error, this function will deallocate */
+       *addr = 0;
+
+       /*
+        * Validate the blob's contents
+        */
+       length = (size_t) size;
+       error = cs_validate_csblob((const uint8_t *)blob->csb_mem_kaddr,
+           length, &cd, &entitlements);
+       if (error) {
+               if (cs_debug) {
+                       printf("CODESIGNING: csblob invalid: %d\n", error);
+               }
+               /*
+                * The vnode checker can't make the rest of this function
+                * succeed if csblob validation failed, so bail */
+               goto out;
+       } else {
+               const unsigned char *md_base;
+               uint8_t hash[CS_HASH_MAX_SIZE];
+               int md_size;
+               vm_offset_t hash_pagemask;
+
+               blob->csb_cd = cd;
+               blob->csb_entitlements_blob = entitlements; /* may be NULL, not yet validated */
+               if (blob->csb_entitlements_blob != NULL) {
+                       blob->csb_entitlements_blob_signature = ptrauth_utils_sign_blob_generic(blob->csb_entitlements_blob,
+                           ntohl(blob->csb_entitlements_blob->length),
+                           OS_PTRAUTH_DISCRIMINATOR("cs_blob.csb_entitlements_blob_signature"),
+                           PTRAUTH_ADDR_DIVERSIFY);
+               }
+               blob->csb_hashtype = cs_find_md(cd->hashType);
+               if (blob->csb_hashtype == NULL || blob->csb_hashtype->cs_digest_size > sizeof(hash)) {
+                       panic("validated CodeDirectory but unsupported type");
+               }
+
+               blob->csb_hash_pageshift = cd->pageSize;
+               hash_pagemask = (1U << cd->pageSize) - 1;
+               blob->csb_hash_firstlevel_pageshift = 0;
+               blob->csb_flags = (ntohl(cd->flags) & CS_ALLOWED_MACHO) | CS_VALID;
+               blob->csb_end_offset = (((vm_offset_t)ntohl(cd->codeLimit) + hash_pagemask) & ~hash_pagemask);
+               if ((ntohl(cd->version) >= CS_SUPPORTSSCATTER) && (ntohl(cd->scatterOffset))) {
+                       const SC_Scatter *scatter = (const SC_Scatter*)
+                           ((const char*)cd + ntohl(cd->scatterOffset));
+                       blob->csb_start_offset = ((off_t)ntohl(scatter->base)) * (1U << blob->csb_hash_pageshift);
+               } else {
+                       blob->csb_start_offset = 0;
+               }
+               /* compute the blob's cdhash */
+               md_base = (const unsigned char *) cd;
+               md_size = ntohl(cd->length);
+
+               blob->csb_hashtype->cs_init(&mdctx);
+               blob->csb_hashtype->cs_update(&mdctx, md_base, md_size);
+               blob->csb_hashtype->cs_final(hash, &mdctx);
+
+               memcpy(blob->csb_cdhash, hash, CS_CDHASH_LEN);
+               blob->csb_cdhash_signature = ptrauth_utils_sign_blob_generic(blob->csb_cdhash,
+                   sizeof(blob->csb_cdhash),
+                   OS_PTRAUTH_DISCRIMINATOR("cs_blob.csb_cd_signature"),
+                   PTRAUTH_ADDR_DIVERSIFY);
+
+#if CONFIG_SUPPLEMENTAL_SIGNATURES
+               blob->csb_linkage_hashtype = NULL;
+               if (ntohl(cd->version) >= CS_SUPPORTSLINKAGE && cd->linkageHashType != 0 &&
+                   ntohl(cd->linkageSize) >= CS_CDHASH_LEN) {
+                       blob->csb_linkage_hashtype = cs_find_md(cd->linkageHashType);
+
+                       if (blob->csb_linkage_hashtype != NULL) {
+                               memcpy(blob->csb_linkage, (uint8_t const*)cd + ntohl(cd->linkageOffset),
+                                   CS_CDHASH_LEN);
+                       }
+               }
+#endif
+       }
+
+       error = 0;
+
+out:
+       if (error != 0) {
+               cs_blob_free(blob);
+               blob = NULL;
+               cd = NULL;
+       }
+
+       if (ret_blob != NULL) {
+               *ret_blob = blob;
+       }
+       if (ret_cd != NULL) {
+               *ret_cd = cd;
+       }
+
+       return error;
+}
+
+/*
+ * Free a cs_blob previously created by cs_blob_create_validated.
+ */
+void
+cs_blob_free(
+       struct cs_blob * const blob)
+{
+       if (blob != NULL) {
+               if (blob->csb_mem_kaddr) {
+                       ubc_cs_blob_deallocate((vm_offset_t)blob->csb_mem_kaddr, blob->csb_mem_size);
+                       blob->csb_mem_kaddr = NULL;
+               }
+               if (blob->csb_entitlements != NULL) {
+                       osobject_release(blob->csb_entitlements);
+                       blob->csb_entitlements = NULL;
+               }
+               (kfree)(blob, sizeof(*blob));
+       }
+}
+#if CONFIG_SUPPLEMENTAL_SIGNATURES
+static void
+cs_blob_supplement_free(struct cs_blob * const blob)
+{
+       if (blob != NULL) {
+               if (blob->csb_supplement_teamid != NULL) {
+                       vm_size_t teamid_size = strlen(blob->csb_supplement_teamid) + 1;
+                       kfree(blob->csb_supplement_teamid, teamid_size);
+                       blob->csb_supplement_teamid = NULL;
+               }
+               cs_blob_free(blob);
+       }
+}
+#endif
+
+static void
+ubc_cs_blob_adjust_statistics(struct cs_blob const *blob)
+{
+       /* Note that the atomic ops are not enough to guarantee
+        * correctness: If a blob with an intermediate size is inserted
+        * concurrently, we can lose a peak value assignment. But these
+        * statistics are only advisory anyway, so we're not going to
+        * employ full locking here. (Consequently, we are also okay with
+        * relaxed ordering of those accesses.)
+        */
+
+       unsigned int new_cs_blob_count = os_atomic_add(&cs_blob_count, 1, relaxed);
+       if (new_cs_blob_count > os_atomic_load(&cs_blob_count_peak, relaxed)) {
+               os_atomic_store(&cs_blob_count_peak, new_cs_blob_count, relaxed);
+       }
+
+       size_t new_cs_blob_size = os_atomic_add(&cs_blob_size, blob->csb_mem_size, relaxed);
+
+       if (new_cs_blob_size > os_atomic_load(&cs_blob_size_peak, relaxed)) {
+               os_atomic_store(&cs_blob_size_peak, new_cs_blob_size, relaxed);
+       }
+       if (blob->csb_mem_size > os_atomic_load(&cs_blob_size_max, relaxed)) {
+               os_atomic_store(&cs_blob_size_max, blob->csb_mem_size, relaxed);
+       }
+}
+
+int
+ubc_cs_blob_add(
+       struct vnode    *vp,
+       uint32_t        platform,
+       cpu_type_t      cputype,
+       cpu_subtype_t   cpusubtype,
+       off_t           base_offset,
+       vm_address_t    *addr,
+       vm_size_t       size,
+       struct image_params *imgp,
+       __unused int    flags,
+       struct cs_blob  **ret_blob)
+{
+       kern_return_t           kr;
+       struct ubc_info         *uip;
+       struct cs_blob          *blob = NULL, *oblob = NULL;
+       int                     error;
+       CS_CodeDirectory const *cd;
+       off_t                   blob_start_offset, blob_end_offset;
+       boolean_t               record_mtime;
+
+       record_mtime = FALSE;
+       if (ret_blob) {
+               *ret_blob = NULL;
+       }
+
+       /* Create the struct cs_blob wrapper that will be attached to the vnode.
+        * Validates the passed in blob in the process. */
+       error = cs_blob_create_validated(addr, size, &blob, &cd);
+
+       if (error != 0) {
+               printf("malform code signature blob: %d\n", error);
+               return error;
+       }
+
+       blob->csb_cpu_type = cputype;
+       blob->csb_cpu_subtype = cpusubtype & ~CPU_SUBTYPE_MASK;
+       blob->csb_base_offset = base_offset;
+
+       /*
+        * Let policy module check whether the blob's signature is accepted.
+        */
+#if CONFIG_MACF
+       unsigned int cs_flags = blob->csb_flags;
+       unsigned int signer_type = blob->csb_signer_type;
+       error = mac_vnode_check_signature(vp, blob, imgp, &cs_flags, &signer_type, flags, platform);
+       blob->csb_flags = cs_flags;
+       blob->csb_signer_type = signer_type;
+
+       if (error) {
+               if (cs_debug) {
+                       printf("check_signature[pid: %d], error = %d\n", current_proc()->p_pid, error);
+               }
+               goto out;
+       }
+       if ((flags & MAC_VNODE_CHECK_DYLD_SIM) && !(blob->csb_flags & CS_PLATFORM_BINARY)) {
+               if (cs_debug) {
+                       printf("check_signature[pid: %d], is not apple signed\n", current_proc()->p_pid);
+               }
+               error = EPERM;
+               goto out;
+       }
+#endif
+
+#if CONFIG_ENFORCE_SIGNED_CODE
+       /*
+        * Reconstitute code signature
+        */
+       {
+               vm_address_t new_mem_kaddr = 0;
+               vm_size_t new_mem_size = 0;
+
+               CS_CodeDirectory *new_cd = NULL;
+               CS_GenericBlob const *new_entitlements = NULL;
+
+               error = ubc_cs_reconstitute_code_signature(blob, 0,
+                   &new_mem_kaddr, &new_mem_size,
+                   &new_cd, &new_entitlements);
+
+               if (error != 0) {
+                       printf("failed code signature reconstitution: %d\n", error);
+                       goto out;
+               }
+
+               ubc_cs_blob_deallocate((vm_offset_t)blob->csb_mem_kaddr, blob->csb_mem_size);
+
+               blob->csb_mem_kaddr = (void *)new_mem_kaddr;
+               blob->csb_mem_size = new_mem_size;
+               blob->csb_cd = new_cd;
+               blob->csb_entitlements_blob = new_entitlements;
+               if (blob->csb_entitlements_blob != NULL) {
+                       blob->csb_entitlements_blob_signature = ptrauth_utils_sign_blob_generic(blob->csb_entitlements_blob,
+                           ntohl(blob->csb_entitlements_blob->length),
+                           OS_PTRAUTH_DISCRIMINATOR("cs_blob.csb_entitlements_blob_signature"),
+                           PTRAUTH_ADDR_DIVERSIFY);
+               }
+               blob->csb_reconstituted = true;
+       }
+#endif
+
+
+       if (blob->csb_flags & CS_PLATFORM_BINARY) {
+               if (cs_debug > 1) {
+                       printf("check_signature[pid: %d]: platform binary\n", current_proc()->p_pid);
+               }
+               blob->csb_platform_binary = 1;
+               blob->csb_platform_path = !!(blob->csb_flags & CS_PLATFORM_PATH);
+       } else {
+               blob->csb_platform_binary = 0;
+               blob->csb_platform_path = 0;
+               blob->csb_teamid = csblob_parse_teamid(blob);
+               if (cs_debug > 1) {
+                       if (blob->csb_teamid) {
+                               printf("check_signature[pid: %d]: team-id is %s\n", current_proc()->p_pid, blob->csb_teamid);
+                       } else {
+                               printf("check_signature[pid: %d]: no team-id\n", current_proc()->p_pid);
+                       }
+               }
+       }
+
+       /*
+        * Validate the blob's coverage
+        */
+       blob_start_offset = blob->csb_base_offset + blob->csb_start_offset;
+       blob_end_offset = blob->csb_base_offset + blob->csb_end_offset;
+
+       if (blob_start_offset >= blob_end_offset ||
+           blob_start_offset < 0 ||
            blob_end_offset <= 0) {
                /* reject empty or backwards blob */
                error = EINVAL;
                goto out;
        }
 
+       if (ubc_cs_supports_multilevel_hash(blob)) {
+               error = ubc_cs_convert_to_multilevel_hash(blob);
+               if (error != 0) {
+                       printf("failed multilevel hash conversion: %d\n", error);
+                       goto out;
+               }
+               blob->csb_reconstituted = true;
+       }
+
        vnode_lock(vp);
-       if (! UBCINFOEXISTS(vp)) {
+       if (!UBCINFOEXISTS(vp)) {
                vnode_unlock(vp);
                error = ENOENT;
                goto out;
@@ -3037,80 +3645,333 @@ ubc_cs_blob_add(
 
        /* check if this new blob overlaps with an existing blob */
        for (oblob = uip->cs_blobs;
-            oblob != NULL;
-            oblob = oblob->csb_next) {
-                off_t oblob_start_offset, oblob_end_offset;
-
-                /* check for conflicting teamid */
-                if (blob->csb_platform_binary) { //platform binary needs to be the same for app slices
-                        if (!oblob->csb_platform_binary) {
-                                vnode_unlock(vp);
-                                error = EALREADY;
-                                goto out;
-                        }
-                } else if (blob->csb_teamid) { //teamid binary needs to be the same for app slices
-                       if (oblob->csb_platform_binary ||
+           oblob != NULL;
+           oblob = oblob->csb_next) {
+               off_t oblob_start_offset, oblob_end_offset;
+
+               if (blob->csb_signer_type != oblob->csb_signer_type) {  // signer type needs to be the same for slices
+                       vnode_unlock(vp);
+                       error = EALREADY;
+                       goto out;
+               } else if (blob->csb_platform_binary) {  //platform binary needs to be the same for app slices
+                       if (!oblob->csb_platform_binary) {
+                               vnode_unlock(vp);
+                               error = EALREADY;
+                               goto out;
+                       }
+               } else if (blob->csb_teamid) {  //teamid binary needs to be the same for app slices
+                       if (oblob->csb_platform_binary ||
                            oblob->csb_teamid == NULL ||
                            strcmp(oblob->csb_teamid, blob->csb_teamid) != 0) {
                                vnode_unlock(vp);
                                error = EALREADY;
                                goto out;
                        }
-                } else { // non teamid binary needs to be the same for app slices
-                       if (oblob->csb_platform_binary ||
-                               oblob->csb_teamid != NULL) {
+               } else {  // non teamid binary needs to be the same for app slices
+                       if (oblob->csb_platform_binary ||
+                           oblob->csb_teamid != NULL) {
+                               vnode_unlock(vp);
+                               error = EALREADY;
+                               goto out;
+                       }
+               }
+
+               oblob_start_offset = (oblob->csb_base_offset +
+                   oblob->csb_start_offset);
+               oblob_end_offset = (oblob->csb_base_offset +
+                   oblob->csb_end_offset);
+               if (blob_start_offset >= oblob_end_offset ||
+                   blob_end_offset <= oblob_start_offset) {
+                       /* no conflict with this existing blob */
+               } else {
+                       /* conflict ! */
+                       if (blob_start_offset == oblob_start_offset &&
+                           blob_end_offset == oblob_end_offset &&
+                           blob->csb_mem_size == oblob->csb_mem_size &&
+                           blob->csb_flags == oblob->csb_flags &&
+                           (blob->csb_cpu_type == CPU_TYPE_ANY ||
+                           oblob->csb_cpu_type == CPU_TYPE_ANY ||
+                           blob->csb_cpu_type == oblob->csb_cpu_type) &&
+                           !bcmp(blob->csb_cdhash,
+                           oblob->csb_cdhash,
+                           CS_CDHASH_LEN)) {
+                               /*
+                                * We already have this blob:
+                                * we'll return success but
+                                * throw away the new blob.
+                                */
+                               if (oblob->csb_cpu_type == CPU_TYPE_ANY) {
+                                       /*
+                                        * The old blob matches this one
+                                        * but doesn't have any CPU type.
+                                        * Update it with whatever the caller
+                                        * provided this time.
+                                        */
+                                       oblob->csb_cpu_type = cputype;
+                               }
+
+                               /* The signature is still accepted, so update the
+                                * generation count. */
+                               uip->cs_add_gen = cs_blob_generation_count;
+
+                               vnode_unlock(vp);
+                               if (ret_blob) {
+                                       *ret_blob = oblob;
+                               }
+                               error = EAGAIN;
+                               goto out;
+                       } else {
+                               /* different blob: reject the new one */
                                vnode_unlock(vp);
                                error = EALREADY;
                                goto out;
                        }
-                }
-
-                oblob_start_offset = (oblob->csb_base_offset +
-                                      oblob->csb_start_offset);
-                oblob_end_offset = (oblob->csb_base_offset +
-                                    oblob->csb_end_offset);
-                if (blob_start_offset >= oblob_end_offset ||
-                    blob_end_offset <= oblob_start_offset) {
-                        /* no conflict with this existing blob */
-                } else {
-                        /* conflict ! */
-                        if (blob_start_offset == oblob_start_offset &&
-                            blob_end_offset == oblob_end_offset &&
-                            blob->csb_mem_size == oblob->csb_mem_size &&
-                            blob->csb_flags == oblob->csb_flags &&
-                            (blob->csb_cpu_type == CPU_TYPE_ANY ||
-                             oblob->csb_cpu_type == CPU_TYPE_ANY ||
-                             blob->csb_cpu_type == oblob->csb_cpu_type) &&
-                            !bcmp(blob->csb_sha1,
-                                  oblob->csb_sha1,
-                                  SHA1_RESULTLEN)) {
-                                /*
-                                 * We already have this blob:
-                                 * we'll return success but
-                                 * throw away the new blob.
-                                 */
-                                if (oblob->csb_cpu_type == CPU_TYPE_ANY) {
-                                        /*
-                                         * The old blob matches this one
-                                         * but doesn't have any CPU type.
-                                         * Update it with whatever the caller
-                                         * provided this time.
-                                         */
-                                        oblob->csb_cpu_type = cputype;
-                                }
-                                vnode_unlock(vp);
-                                error = EAGAIN;
-                                goto out;
-                        } else {
-                                /* different blob: reject the new one */
-                                vnode_unlock(vp);
-                                error = EALREADY;
-                                goto out;
-                        }
-                }
+               }
+       }
+
+
+       /* mark this vnode's VM object as having "signed pages" */
+       kr = memory_object_signed(uip->ui_control, TRUE);
+       if (kr != KERN_SUCCESS) {
+               vnode_unlock(vp);
+               error = ENOENT;
+               goto out;
+       }
+
+       if (uip->cs_blobs == NULL) {
+               /* loading 1st blob: record the file's current "modify time" */
+               record_mtime = TRUE;
+       }
+
+       /* set the generation count for cs_blobs */
+       uip->cs_add_gen = cs_blob_generation_count;
+
+       /*
+        * Add this blob to the list of blobs for this vnode.
+        * We always add at the front of the list and we never remove a
+        * blob from the list, so ubc_cs_get_blobs() can return whatever
+        * the top of the list was and that list will remain valid
+        * while we validate a page, even after we release the vnode's lock.
+        */
+       blob->csb_next = uip->cs_blobs;
+       uip->cs_blobs = blob;
+
+       ubc_cs_blob_adjust_statistics(blob);
+
+       if (cs_debug > 1) {
+               proc_t p;
+               const char *name = vnode_getname_printable(vp);
+               p = current_proc();
+               printf("CODE SIGNING: proc %d(%s) "
+                   "loaded %s signatures for file (%s) "
+                   "range 0x%llx:0x%llx flags 0x%x\n",
+                   p->p_pid, p->p_comm,
+                   blob->csb_cpu_type == -1 ? "detached" : "embedded",
+                   name,
+                   blob->csb_base_offset + blob->csb_start_offset,
+                   blob->csb_base_offset + blob->csb_end_offset,
+                   blob->csb_flags);
+               vnode_putname_printable(name);
+       }
+
+       vnode_unlock(vp);
+
+       if (record_mtime) {
+               vnode_mtime(vp, &uip->cs_mtime, vfs_context_current());
+       }
+
+       if (ret_blob) {
+               *ret_blob = blob;
+       }
+
+       error = 0;      /* success ! */
+
+out:
+       if (error) {
+               if (cs_debug) {
+                       printf("check_signature[pid: %d]: error = %d\n", current_proc()->p_pid, error);
+               }
+
+               cs_blob_free(blob);
+       }
+
+       if (error == EAGAIN) {
+               /*
+                * See above:  error is EAGAIN if we were asked
+                * to add an existing blob again.  We cleaned the new
+                * blob and we want to return success.
+                */
+               error = 0;
+       }
+
+       return error;
+}
+
+#if CONFIG_SUPPLEMENTAL_SIGNATURES
+int
+ubc_cs_blob_add_supplement(
+       struct vnode    *vp,
+       struct vnode    *orig_vp,
+       off_t           base_offset,
+       vm_address_t    *addr,
+       vm_size_t       size,
+       struct cs_blob  **ret_blob)
+{
+       kern_return_t           kr;
+       struct ubc_info         *uip, *orig_uip;
+       int                     error;
+       struct cs_blob          *blob, *orig_blob;
+       CS_CodeDirectory const *cd;
+       off_t                   blob_start_offset, blob_end_offset;
+
+       if (ret_blob) {
+               *ret_blob = NULL;
+       }
+
+       /* Create the struct cs_blob wrapper that will be attached to the vnode.
+        * Validates the passed in blob in the process. */
+       error = cs_blob_create_validated(addr, size, &blob, &cd);
+
+       if (error != 0) {
+               printf("malformed code signature supplement blob: %d\n", error);
+               return error;
+       }
+
+       blob->csb_cpu_type = -1;
+       blob->csb_base_offset = base_offset;
+
+       blob->csb_reconstituted = false;
+
+       vnode_lock(orig_vp);
+       if (!UBCINFOEXISTS(orig_vp)) {
+               vnode_unlock(orig_vp);
+               error = ENOENT;
+               goto out;
+       }
+
+       orig_uip = orig_vp->v_ubcinfo;
+
+       /* check that the supplement's linked cdhash matches a cdhash of
+        * the target image.
+        */
+
+       if (blob->csb_linkage_hashtype == NULL) {
+               proc_t p;
+               const char *iname = vnode_getname_printable(vp);
+               p = current_proc();
+
+               printf("CODE SIGNING: proc %d(%s) supplemental signature for file (%s) "
+                   "is not a supplemental.\n",
+                   p->p_pid, p->p_comm, iname);
+
+               error = EINVAL;
+
+               vnode_putname_printable(iname);
+               vnode_unlock(orig_vp);
+               goto out;
+       }
+
+       for (orig_blob = orig_uip->cs_blobs; orig_blob != NULL;
+           orig_blob = orig_blob->csb_next) {
+               ptrauth_utils_auth_blob_generic(orig_blob->csb_cdhash,
+                   sizeof(orig_blob->csb_cdhash),
+                   OS_PTRAUTH_DISCRIMINATOR("cs_blob.csb_cd_signature"),
+                   PTRAUTH_ADDR_DIVERSIFY,
+                   orig_blob->csb_cdhash_signature);
+               if (orig_blob->csb_hashtype == blob->csb_linkage_hashtype &&
+                   memcmp(orig_blob->csb_cdhash, blob->csb_linkage, CS_CDHASH_LEN) == 0) {
+                       // Found match!
+                       break;
+               }
+       }
+
+       if (orig_blob == NULL) {
+               // Not found.
+
+               proc_t p;
+               const char *iname = vnode_getname_printable(vp);
+               p = current_proc();
+
+               printf("CODE SIGNING: proc %d(%s) supplemental signature for file (%s) "
+                   "does not match any attached cdhash.\n",
+                   p->p_pid, p->p_comm, iname);
+
+               error = ESRCH;
+
+               vnode_putname_printable(iname);
+               vnode_unlock(orig_vp);
+               goto out;
+       }
+
+       vnode_unlock(orig_vp);
+
+       // validate the signature against policy!
+#if CONFIG_MACF
+       unsigned int signer_type = blob->csb_signer_type;
+       error = mac_vnode_check_supplemental_signature(vp, blob, orig_vp, orig_blob, &signer_type);
+       blob->csb_signer_type = signer_type;
+
+
+       if (error) {
+               if (cs_debug) {
+                       printf("check_supplemental_signature[pid: %d], error = %d\n", current_proc()->p_pid, error);
+               }
+               goto out;
+       }
+#endif
+
+       // We allowed the supplemental signature blob so
+       // copy the platform bit or team-id from the linked signature and whether or not the original is developer code
+       blob->csb_platform_binary = 0;
+       blob->csb_platform_path = 0;
+       if (orig_blob->csb_platform_binary == 1) {
+               blob->csb_platform_binary = orig_blob->csb_platform_binary;
+               blob->csb_platform_path = orig_blob->csb_platform_path;
+       } else if (orig_blob->csb_teamid != NULL) {
+               vm_size_t teamid_size = strlen(orig_blob->csb_teamid) + 1;
+               blob->csb_supplement_teamid  = kalloc(teamid_size);
+               if (blob->csb_supplement_teamid == NULL) {
+                       error = ENOMEM;
+                       goto out;
+               }
+               strlcpy(blob->csb_supplement_teamid, orig_blob->csb_teamid, teamid_size);
+       }
+       blob->csb_flags = (orig_blob->csb_flags & CS_DEV_CODE);
+
+       // Validate the blob's coverage
+       blob_start_offset = blob->csb_base_offset + blob->csb_start_offset;
+       blob_end_offset = blob->csb_base_offset + blob->csb_end_offset;
+
+       if (blob_start_offset >= blob_end_offset || blob_start_offset < 0 || blob_end_offset <= 0) {
+               /* reject empty or backwards blob */
+               error = EINVAL;
+               goto out;
+       }
+
+       vnode_lock(vp);
+       if (!UBCINFOEXISTS(vp)) {
+               vnode_unlock(vp);
+               error = ENOENT;
+               goto out;
+       }
+       uip = vp->v_ubcinfo;
+
+       struct cs_blob *existing = uip->cs_blob_supplement;
+       if (existing != NULL) {
+               if (blob->csb_hashtype == existing->csb_hashtype &&
+                   memcmp(blob->csb_cdhash, existing->csb_cdhash, CS_CDHASH_LEN) == 0) {
+                       error = EAGAIN; // non-fatal
+               } else {
+                       error = EALREADY; // fatal
+               }
 
+               vnode_unlock(vp);
+               goto out;
        }
 
+       /* Unlike regular cs_blobs, we only ever support one supplement. */
+       blob->csb_next = NULL;
+       uip->cs_blob_supplement = blob;
 
        /* mark this vnode's VM object as having "signed pages" */
        kr = memory_object_signed(uip->ui_control, TRUE);
@@ -3120,114 +3981,149 @@ ubc_cs_blob_add(
                goto out;
        }
 
-       if (uip->cs_blobs == NULL) {
-               /* loading 1st blob: record the file's current "modify time" */
-               record_mtime = TRUE;
-       }
-
-       /* set the generation count for cs_blobs */
-       uip->cs_add_gen = cs_blob_generation_count;
-
-       /*
-        * Add this blob to the list of blobs for this vnode.
-        * We always add at the front of the list and we never remove a
-        * blob from the list, so ubc_cs_get_blobs() can return whatever
-        * the top of the list was and that list will remain valid
-        * while we validate a page, even after we release the vnode's lock.
-        */
-       blob->csb_next = uip->cs_blobs;
-       uip->cs_blobs = blob;
+       vnode_unlock(vp);
 
-       OSAddAtomic(+1, &cs_blob_count);
-       if (cs_blob_count > cs_blob_count_peak) {
-               cs_blob_count_peak = cs_blob_count; /* XXX atomic ? */
-       }
-       OSAddAtomic((SInt32) +blob->csb_mem_size, &cs_blob_size);
-       if ((SInt32) cs_blob_size > cs_blob_size_peak) {
-               cs_blob_size_peak = (SInt32) cs_blob_size; /* XXX atomic ? */
-       }
-       if ((UInt32) blob->csb_mem_size > cs_blob_size_max) {
-               cs_blob_size_max = (UInt32) blob->csb_mem_size;
-       }
+       /* We still adjust statistics even for supplemental blobs, as they
+        * consume memory just the same. */
+       ubc_cs_blob_adjust_statistics(blob);
 
        if (cs_debug > 1) {
                proc_t p;
                const char *name = vnode_getname_printable(vp);
                p = current_proc();
                printf("CODE SIGNING: proc %d(%s) "
-                      "loaded %s signatures for file (%s) "
-                      "range 0x%llx:0x%llx flags 0x%x\n",
-                      p->p_pid, p->p_comm,
-                      blob->csb_cpu_type == -1 ? "detached" : "embedded",
-                      name,
-                      blob->csb_base_offset + blob->csb_start_offset,
-                      blob->csb_base_offset + blob->csb_end_offset,
-                      blob->csb_flags);
+                   "loaded supplemental signature for file (%s) "
+                   "range 0x%llx:0x%llx\n",
+                   p->p_pid, p->p_comm,
+                   name,
+                   blob->csb_base_offset + blob->csb_start_offset,
+                   blob->csb_base_offset + blob->csb_end_offset);
                vnode_putname_printable(name);
        }
 
-       vnode_unlock(vp);
-
-       if (record_mtime) {
-               vnode_mtime(vp, &uip->cs_mtime, vfs_context_current());
+       if (ret_blob) {
+               *ret_blob = blob;
        }
 
-       error = 0;      /* success ! */
-
+       error = 0; // Success!
 out:
        if (error) {
-               if (cs_debug)
-                       printf("check_signature[pid: %d]: error = %d\n", current_proc()->p_pid, error);
-
-               /* we failed; release what we allocated */
-               if (blob) {
-                       kfree(blob, sizeof (*blob));
-                       blob = NULL;
-               }
-               if (blob_handle != IPC_PORT_NULL) {
-                       mach_memory_entry_port_release(blob_handle);
-                       blob_handle = IPC_PORT_NULL;
+               if (cs_debug) {
+                       printf("ubc_cs_blob_add_supplement[pid: %d]: error = %d\n", current_proc()->p_pid, error);
                }
+
+               cs_blob_supplement_free(blob);
        }
 
        if (error == EAGAIN) {
-               /*
-                * See above:  error is EAGAIN if we were asked 
-                * to add an existing blob again.  We cleaned the new
-                * blob and we want to return success.
-                */
+               /* We were asked to add an existing blob.
+                * We cleaned up and ignore the attempt. */
                error = 0;
-               /*
-                * Since we're not failing, consume the data we received.
-                */
-               ubc_cs_blob_deallocate(addr, size);
        }
 
        return error;
 }
+#endif
+
+
+
+void
+csvnode_print_debug(struct vnode *vp)
+{
+       const char      *name = NULL;
+       struct ubc_info *uip;
+       struct cs_blob *blob;
+
+       name = vnode_getname_printable(vp);
+       if (name) {
+               printf("csvnode: name: %s\n", name);
+               vnode_putname_printable(name);
+       }
+
+       vnode_lock_spin(vp);
+
+       if (!UBCINFOEXISTS(vp)) {
+               blob = NULL;
+               goto out;
+       }
+
+       uip = vp->v_ubcinfo;
+       for (blob = uip->cs_blobs; blob != NULL; blob = blob->csb_next) {
+               printf("csvnode: range: %lu -> %lu flags: 0x%08x platform: %s path: %s team: %s\n",
+                   (unsigned long)blob->csb_start_offset,
+                   (unsigned long)blob->csb_end_offset,
+                   blob->csb_flags,
+                   blob->csb_platform_binary ? "yes" : "no",
+                   blob->csb_platform_path ? "yes" : "no",
+                   blob->csb_teamid ? blob->csb_teamid : "<NO-TEAM>");
+       }
+
+out:
+       vnode_unlock(vp);
+}
+
+#if CONFIG_SUPPLEMENTAL_SIGNATURES
+struct cs_blob *
+ubc_cs_blob_get_supplement(
+       struct vnode    *vp,
+       off_t           offset)
+{
+       struct cs_blob *blob;
+       off_t offset_in_blob;
+
+       vnode_lock_spin(vp);
+
+       if (!UBCINFOEXISTS(vp)) {
+               blob = NULL;
+               goto out;
+       }
+
+       blob = vp->v_ubcinfo->cs_blob_supplement;
+
+       if (blob == NULL) {
+               // no supplemental blob
+               goto out;
+       }
+
+
+       if (offset != -1) {
+               offset_in_blob = offset - blob->csb_base_offset;
+               if (offset_in_blob < blob->csb_start_offset || offset_in_blob >= blob->csb_end_offset) {
+                       // not actually covered by this blob
+                       blob = NULL;
+               }
+       }
+
+out:
+       vnode_unlock(vp);
+
+       return blob;
+}
+#endif
 
 struct cs_blob *
 ubc_cs_blob_get(
-       struct vnode    *vp,
-       cpu_type_t      cputype,
-       off_t           offset)
+       struct vnode    *vp,
+       cpu_type_t      cputype,
+       cpu_subtype_t   cpusubtype,
+       off_t           offset)
 {
-       struct ubc_info *uip;
-       struct cs_blob  *blob;
+       struct ubc_info *uip;
+       struct cs_blob  *blob;
        off_t offset_in_blob;
 
        vnode_lock_spin(vp);
 
-       if (! UBCINFOEXISTS(vp)) {
+       if (!UBCINFOEXISTS(vp)) {
                blob = NULL;
                goto out;
        }
 
        uip = vp->v_ubcinfo;
        for (blob = uip->cs_blobs;
-            blob != NULL;
-            blob = blob->csb_next) {
-               if (cputype != -1 && blob->csb_cpu_type == cputype) {
+           blob != NULL;
+           blob = blob->csb_next) {
+               if (cputype != -1 && blob->csb_cpu_type == cputype && (cpusubtype == -1 || blob->csb_cpu_subtype == (cpusubtype & ~CPU_SUBTYPE_MASK))) {
                        break;
                }
                if (offset != -1) {
@@ -3240,10 +4136,6 @@ ubc_cs_blob_get(
                }
        }
 
-       if (cs_debug && blob != NULL && blob->csb_sigpup) {
-               printf("found sig pup blob\n");
-       }
-
 out:
        vnode_unlock(vp);
 
@@ -3252,31 +4144,31 @@ out:
 
 static void
 ubc_cs_free(
-       struct ubc_info *uip)
+       struct ubc_info *uip)
 {
-       struct cs_blob  *blob, *next_blob;
+       struct cs_blob  *blob, *next_blob;
 
        for (blob = uip->cs_blobs;
-            blob != NULL;
-            blob = next_blob) {
+           blob != NULL;
+           blob = next_blob) {
                next_blob = blob->csb_next;
-               if (blob->csb_mem_kaddr != 0 && !blob->csb_sigpup) {
-                       ubc_cs_blob_deallocate(blob->csb_mem_kaddr,
-                                              blob->csb_mem_size);
-                       blob->csb_mem_kaddr = 0;
-               }
-               if (blob->csb_mem_handle != IPC_PORT_NULL) {
-                       mach_memory_entry_port_release(blob->csb_mem_handle);
-               }
-               blob->csb_mem_handle = IPC_PORT_NULL;
-               OSAddAtomic(-1, &cs_blob_count);
-               OSAddAtomic((SInt32) -blob->csb_mem_size, &cs_blob_size);
-               kfree(blob, sizeof (*blob));
+               os_atomic_add(&cs_blob_count, -1, relaxed);
+               os_atomic_add(&cs_blob_size, -blob->csb_mem_size, relaxed);
+               cs_blob_free(blob);
        }
 #if CHECK_CS_VALIDATION_BITMAP
        ubc_cs_validation_bitmap_deallocate( uip->ui_vnode );
 #endif
        uip->cs_blobs = NULL;
+#if CONFIG_SUPPLEMENTAL_SIGNATURES
+       if (uip->cs_blob_supplement != NULL) {
+               blob = uip->cs_blob_supplement;
+               os_atomic_add(&cs_blob_count, -1, relaxed);
+               os_atomic_add(&cs_blob_size, -blob->csb_mem_size, relaxed);
+               cs_blob_supplement_free(uip->cs_blob_supplement);
+               uip->cs_blob_supplement = NULL;
+       }
+#endif
 }
 
 /* check cs blob generation on vnode
@@ -3286,7 +4178,7 @@ ubc_cs_free(
  */
 int
 ubc_cs_generation_check(
-       struct vnode    *vp)
+       struct vnode    *vp)
 {
        int retval = ENEEDAUTH;
 
@@ -3302,20 +4194,23 @@ ubc_cs_generation_check(
 
 int
 ubc_cs_blob_revalidate(
-       struct vnode    *vp,
-       struct cs_blob *blob
+       struct vnode    *vp,
+       struct cs_blob *blob,
+       struct image_params *imgp,
+       int flags,
+       uint32_t platform
        )
 {
        int error = 0;
-#if CONFIG_MACF
-       int is_platform_binary = 0;
-#endif
        const CS_CodeDirectory *cd = NULL;
-       
+       const CS_GenericBlob *entitlements = NULL;
+       size_t size;
        assert(vp != NULL);
        assert(blob != NULL);
 
-       error = cs_validate_csblob((const uint8_t *)blob->csb_mem_kaddr, blob->csb_mem_size, &cd);
+       size = blob->csb_mem_size;
+       error = cs_validate_csblob((const uint8_t *)blob->csb_mem_kaddr,
+           size, &cd, &entitlements);
        if (error) {
                if (cs_debug) {
                        printf("CODESIGNING: csblob invalid: %d\n", error);
@@ -3323,21 +4218,58 @@ ubc_cs_blob_revalidate(
                goto out;
        }
 
+       unsigned int cs_flags = (ntohl(cd->flags) & CS_ALLOWED_MACHO) | CS_VALID;
+       unsigned int signer_type = CS_SIGNER_TYPE_UNKNOWN;
+
+       if (blob->csb_reconstituted) {
+               /*
+                * Code signatures that have been modified after validation
+                * cannot be revalidated inline from their in-memory blob.
+                *
+                * That's okay, though, because the only path left that relies
+                * on revalidation of existing in-memory blobs is the legacy
+                * detached signature database path, which only exists on macOS,
+                * which does not do reconstitution of any kind.
+                */
+               if (cs_debug) {
+                       printf("CODESIGNING: revalidate: not inline revalidating reconstituted signature.\n");
+               }
+
+               /*
+                * EAGAIN tells the caller that they may reread the code
+                * signature and try attaching it again, which is the same
+                * thing they would do if there was no cs_blob yet in the
+                * first place.
+                *
+                * Conveniently, after ubc_cs_blob_add did a successful
+                * validation, it will detect that a matching cs_blob (cdhash,
+                * offset, arch etc.) already exists, and return success
+                * without re-adding a cs_blob to the vnode.
+                */
+               return EAGAIN;
+       }
+
        /* callout to mac_vnode_check_signature */
 #if CONFIG_MACF
-       error = mac_vnode_check_signature(vp, blob->csb_base_offset, blob->csb_sha1, (const void*)cd, blob->csb_cpu_type, &is_platform_binary);
+       error = mac_vnode_check_signature(vp, blob, imgp, &cs_flags, &signer_type, flags, platform);
        if (cs_debug && error) {
-                       printf("revalidate: check_signature[pid: %d], error = %d\n", current_proc()->p_pid, error);
+               printf("revalidate: check_signature[pid: %d], error = %d\n", current_proc()->p_pid, error);
        }
+#else
+       (void)flags;
+       (void)signer_type;
 #endif
 
        /* update generation number if success */
        vnode_lock_spin(vp);
+       blob->csb_flags = cs_flags;
+       blob->csb_signer_type = signer_type;
        if (UBCINFOEXISTS(vp)) {
-               if (error == 0)
+               if (error == 0) {
                        vp->v_ubcinfo->cs_add_gen = cs_blob_generation_count;
-               else
+               } else {
                        vp->v_ubcinfo->cs_add_gen = 0;
+               }
        }
 
        vnode_unlock(vp);
@@ -3356,10 +4288,10 @@ cs_blob_reset_cache()
 
 struct cs_blob *
 ubc_get_cs_blobs(
-       struct vnode    *vp)
+       struct vnode    *vp)
 {
-       struct ubc_info *uip;
-       struct cs_blob  *blobs;
+       struct ubc_info *uip;
+       struct cs_blob  *blobs;
 
        /*
         * No need to take the vnode lock here.  The caller must be holding
@@ -3376,7 +4308,7 @@ ubc_get_cs_blobs(
         * vnode lock, for example.
         */
 
-       if (! UBCINFOEXISTS(vp)) {
+       if (!UBCINFOEXISTS(vp)) {
                blobs = NULL;
                goto out;
        }
@@ -3388,14 +4320,50 @@ out:
        return blobs;
 }
 
+#if CONFIG_SUPPLEMENTAL_SIGNATURES
+struct cs_blob *
+ubc_get_cs_supplement(
+       struct vnode    *vp)
+{
+       struct ubc_info *uip;
+       struct cs_blob  *blob;
+
+       /*
+        * No need to take the vnode lock here.  The caller must be holding
+        * a reference on the vnode (via a VM mapping or open file descriptor),
+        * so the vnode will not go away.  The ubc_info stays until the vnode
+        * goes away.
+        * The ubc_info could go away entirely if the vnode gets reclaimed as
+        * part of a forced unmount.  In the case of a code-signature validation
+        * during a page fault, the "paging_in_progress" reference on the VM
+        * object guarantess that the vnode pager (and the ubc_info) won't go
+        * away during the fault.
+        * Other callers need to protect against vnode reclaim by holding the
+        * vnode lock, for example.
+        */
+
+       if (!UBCINFOEXISTS(vp)) {
+               blob = NULL;
+               goto out;
+       }
+
+       uip = vp->v_ubcinfo;
+       blob = uip->cs_blob_supplement;
+
+out:
+       return blob;
+}
+#endif
+
+
 void
 ubc_get_cs_mtime(
-       struct vnode    *vp,
-       struct timespec *cs_mtime)
+       struct vnode    *vp,
+       struct timespec *cs_mtime)
 {
-       struct ubc_info *uip;
+       struct ubc_info *uip;
 
-       if (! UBCINFOEXISTS(vp)) {
+       if (!UBCINFOEXISTS(vp)) {
                cs_mtime->tv_sec = 0;
                cs_mtime->tv_nsec = 0;
                return;
@@ -3408,40 +4376,36 @@ ubc_get_cs_mtime(
 
 unsigned long cs_validate_page_no_hash = 0;
 unsigned long cs_validate_page_bad_hash = 0;
-boolean_t
-cs_validate_page(
-       void                    *_blobs,
-       memory_object_t         pager,
-       memory_object_offset_t  page_offset,
-       const void              *data,
-       boolean_t               *tainted)
-{
-       SHA1_CTX                sha1ctxt;
-       unsigned char           actual_hash[SHA1_RESULTLEN];
-       unsigned char           expected_hash[SHA1_RESULTLEN];
-       boolean_t               found_hash;
-       struct cs_blob          *blobs, *blob;
-       const CS_CodeDirectory  *cd;
-       const CS_SuperBlob      *embedded;
-       const unsigned char     *hash;
-       boolean_t               validated;
-       off_t                   offset; /* page offset in the file */
-       size_t                  size;
-       off_t                   codeLimit = 0;
-       char                    *lower_bound, *upper_bound;
-       vm_offset_t             kaddr, blob_addr;
-       vm_size_t               ksize;
-       kern_return_t           kr;
-
-       offset = page_offset;
+static boolean_t
+cs_validate_hash(
+       struct cs_blob          *blobs,
+       memory_object_t         pager,
+       memory_object_offset_t  page_offset,
+       const void              *data,
+       vm_size_t               *bytes_processed,
+       unsigned                *tainted)
+{
+       union cs_hash_union     mdctx;
+       struct cs_hash const    *hashtype = NULL;
+       unsigned char           actual_hash[CS_HASH_MAX_SIZE];
+       unsigned char           expected_hash[CS_HASH_MAX_SIZE];
+       boolean_t               found_hash;
+       struct cs_blob          *blob;
+       const CS_CodeDirectory  *cd;
+       const unsigned char     *hash;
+       boolean_t               validated;
+       off_t                   offset; /* page offset in the file */
+       size_t                  size;
+       off_t                   codeLimit = 0;
+       const char              *lower_bound, *upper_bound;
+       vm_offset_t             kaddr, blob_addr;
 
        /* retrieve the expected hash */
        found_hash = FALSE;
-       blobs = (struct cs_blob *) _blobs;
 
        for (blob = blobs;
-            blob != NULL;
-            blob = blob->csb_next) {
+           blob != NULL;
+           blob = blob->csb_next) {
                offset = page_offset - blob->csb_base_offset;
                if (offset < blob->csb_start_offset ||
                    offset >= blob->csb_end_offset) {
@@ -3449,78 +4413,42 @@ cs_validate_page(
                        continue;
                }
 
-               /* map the blob in the kernel address space */
-               kaddr = blob->csb_mem_kaddr;
+               /* blob data has been released */
+               kaddr = (vm_offset_t)blob->csb_mem_kaddr;
                if (kaddr == 0) {
-                       ksize = (vm_size_t) (blob->csb_mem_size +
-                                            blob->csb_mem_offset);
-                       kr = vm_map(kernel_map,
-                                   &kaddr,
-                                   ksize,
-                                   0,
-                                   VM_FLAGS_ANYWHERE,
-                                   blob->csb_mem_handle,
-                                   0,
-                                   TRUE,
-                                   VM_PROT_READ,
-                                   VM_PROT_READ,
-                                   VM_INHERIT_NONE);
-                       if (kr != KERN_SUCCESS) {
-                               /* XXX FBDP what to do !? */
-                               printf("cs_validate_page: failed to map blob, "
-                                      "size=0x%lx kr=0x%x\n",
-                                      (size_t)blob->csb_mem_size, kr);
-                               break;
-                       }
+                       continue;
                }
-               if (blob->csb_sigpup && cs_debug)
-                       printf("checking for a sigpup CD\n");
 
                blob_addr = kaddr + blob->csb_mem_offset;
-               
                lower_bound = CAST_DOWN(char *, blob_addr);
                upper_bound = lower_bound + blob->csb_mem_size;
 
-               embedded = (const CS_SuperBlob *) blob_addr;
-               cd = findCodeDirectory(embedded, lower_bound, upper_bound);
+               cd = blob->csb_cd;
                if (cd != NULL) {
-                       if (cd->pageSize != PAGE_SHIFT_4K ||
-                           cd->hashType != CS_HASHTYPE_SHA1 ||
-                           cd->hashSize != SHA1_RESULTLEN) {
-                               /* bogus blob ? */
-                               if (blob->csb_sigpup && cs_debug)
-                                       printf("page foo bogus sigpup CD\n");
-                               continue;
-                       }
+                       /* all CD's that have been injected is already validated */
 
-                       offset = page_offset - blob->csb_base_offset;
-                       if (offset < blob->csb_start_offset ||
-                           offset >= blob->csb_end_offset) {
-                               /* our page is not covered by this blob */
-                               if (blob->csb_sigpup && cs_debug)
-                                       printf("OOB sigpup CD\n");
-                               continue;
+                       hashtype = blob->csb_hashtype;
+                       if (hashtype == NULL) {
+                               panic("unknown hash type ?");
+                       }
+                       if (hashtype->cs_digest_size > sizeof(actual_hash)) {
+                               panic("hash size too large");
+                       }
+                       if (offset & ((1U << blob->csb_hash_pageshift) - 1)) {
+                               panic("offset not aligned to cshash boundary");
                        }
 
                        codeLimit = ntohl(cd->codeLimit);
-                       if (blob->csb_sigpup && cs_debug)
-                               printf("sigpup codesize %d\n", (int)codeLimit);
 
-                       hash = hashes(cd, (unsigned)(offset>>PAGE_SHIFT_4K),
-                                     lower_bound, upper_bound);
+                       hash = hashes(cd, (uint32_t)(offset >> blob->csb_hash_pageshift),
+                           hashtype->cs_size,
+                           lower_bound, upper_bound);
                        if (hash != NULL) {
-                               bcopy(hash, expected_hash,
-                                     sizeof (expected_hash));
+                               bcopy(hash, expected_hash, hashtype->cs_size);
                                found_hash = TRUE;
-                               if (blob->csb_sigpup && cs_debug)
-                                       printf("sigpup hash\n");
                        }
 
                        break;
-               } else {
-                       if (blob->csb_sigpup && cs_debug)
-                               printf("sig pup had no valid CD\n");
-
                }
        }
 
@@ -3536,73 +4464,242 @@ cs_validate_page(
                cs_validate_page_no_hash++;
                if (cs_debug > 1) {
                        printf("CODE SIGNING: cs_validate_page: "
-                              "mobj %p off 0x%llx: no hash to validate !?\n",
-                              pager, page_offset);
+                           "mobj %p off 0x%llx: no hash to validate !?\n",
+                           pager, page_offset);
                }
                validated = FALSE;
-               *tainted = FALSE;
+               *tainted = 0;
        } else {
+               *tainted = 0;
+
+               size = (1U << blob->csb_hash_pageshift);
+               *bytes_processed = size;
 
-               size = PAGE_SIZE_4K;
                const uint32_t *asha1, *esha1;
                if ((off_t)(offset + size) > codeLimit) {
                        /* partial page at end of segment */
                        assert(offset < codeLimit);
-                       size = (size_t) (codeLimit & PAGE_MASK_4K);
+                       size = (size_t) (codeLimit & (size - 1));
+                       *tainted |= CS_VALIDATE_NX;
                }
-               /* compute the actual page's SHA1 hash */
-               SHA1Init(&sha1ctxt);
-               SHA1UpdateUsePhysicalAddress(&sha1ctxt, data, size);
-               SHA1Final(actual_hash, &sha1ctxt);
+
+               hashtype->cs_init(&mdctx);
+
+               if (blob->csb_hash_firstlevel_pageshift) {
+                       const unsigned char *partial_data = (const unsigned char *)data;
+                       size_t i;
+                       for (i = 0; i < size;) {
+                               union cs_hash_union     partialctx;
+                               unsigned char partial_digest[CS_HASH_MAX_SIZE];
+                               size_t partial_size = MIN(size - i, (1U << blob->csb_hash_firstlevel_pageshift));
+
+                               hashtype->cs_init(&partialctx);
+                               hashtype->cs_update(&partialctx, partial_data, partial_size);
+                               hashtype->cs_final(partial_digest, &partialctx);
+
+                               /* Update cumulative multi-level hash */
+                               hashtype->cs_update(&mdctx, partial_digest, hashtype->cs_size);
+                               partial_data = partial_data + partial_size;
+                               i += partial_size;
+                       }
+               } else {
+                       hashtype->cs_update(&mdctx, data, size);
+               }
+               hashtype->cs_final(actual_hash, &mdctx);
 
                asha1 = (const uint32_t *) actual_hash;
                esha1 = (const uint32_t *) expected_hash;
 
-               if (bcmp(expected_hash, actual_hash, SHA1_RESULTLEN) != 0) {
+               if (bcmp(expected_hash, actual_hash, hashtype->cs_size) != 0) {
                        if (cs_debug) {
                                printf("CODE SIGNING: cs_validate_page: "
-                                      "mobj %p off 0x%llx size 0x%lx: "
-                                      "actual [0x%x 0x%x 0x%x 0x%x 0x%x] != "
-                                      "expected [0x%x 0x%x 0x%x 0x%x 0x%x]\n",
-                                      pager, page_offset, size,
-                                      asha1[0], asha1[1], asha1[2],
-                                      asha1[3], asha1[4],
-                                      esha1[0], esha1[1], esha1[2],
-                                      esha1[3], esha1[4]);
+                                   "mobj %p off 0x%llx size 0x%lx: "
+                                   "actual [0x%x 0x%x 0x%x 0x%x 0x%x] != "
+                                   "expected [0x%x 0x%x 0x%x 0x%x 0x%x]\n",
+                                   pager, page_offset, size,
+                                   asha1[0], asha1[1], asha1[2],
+                                   asha1[3], asha1[4],
+                                   esha1[0], esha1[1], esha1[2],
+                                   esha1[3], esha1[4]);
                        }
                        cs_validate_page_bad_hash++;
-                       *tainted = TRUE;
+                       *tainted |= CS_VALIDATE_TAINTED;
                } else {
                        if (cs_debug > 10) {
                                printf("CODE SIGNING: cs_validate_page: "
-                                      "mobj %p off 0x%llx size 0x%lx: "
-                                      "SHA1 OK\n",
-                                      pager, page_offset, size);
+                                   "mobj %p off 0x%llx size 0x%lx: "
+                                   "SHA1 OK\n",
+                                   pager, page_offset, size);
                        }
-                       *tainted = FALSE;
                }
                validated = TRUE;
        }
-       
+
        return validated;
 }
 
+boolean_t
+cs_validate_range(
+       struct vnode    *vp,
+       memory_object_t         pager,
+       memory_object_offset_t  page_offset,
+       const void              *data,
+       vm_size_t               dsize,
+       unsigned                *tainted)
+{
+       vm_size_t offset_in_range;
+       boolean_t all_subranges_validated = TRUE; /* turn false if any subrange fails */
+
+       struct cs_blob *blobs = ubc_get_cs_blobs(vp);
+
+#if CONFIG_SUPPLEMENTAL_SIGNATURES
+       if (blobs == NULL && proc_is_translated(current_proc())) {
+               struct cs_blob *supp = ubc_get_cs_supplement(vp);
+
+               if (supp != NULL) {
+                       blobs = supp;
+               } else {
+                       return FALSE;
+               }
+       }
+#endif
+
+
+
+       *tainted = 0;
+
+       for (offset_in_range = 0;
+           offset_in_range < dsize;
+           /* offset_in_range updated based on bytes processed */) {
+               unsigned subrange_tainted = 0;
+               boolean_t subrange_validated;
+               vm_size_t bytes_processed = 0;
+
+               subrange_validated = cs_validate_hash(blobs,
+                   pager,
+                   page_offset + offset_in_range,
+                   (const void *)((const char *)data + offset_in_range),
+                   &bytes_processed,
+                   &subrange_tainted);
+
+               *tainted |= subrange_tainted;
+
+               if (bytes_processed == 0) {
+                       /* Cannote make forward progress, so return an error */
+                       all_subranges_validated = FALSE;
+                       break;
+               } else if (subrange_validated == FALSE) {
+                       all_subranges_validated = FALSE;
+                       /* Keep going to detect other types of failures in subranges */
+               }
+
+               offset_in_range += bytes_processed;
+       }
+
+       return all_subranges_validated;
+}
+
+void
+cs_validate_page(
+       struct vnode            *vp,
+       memory_object_t         pager,
+       memory_object_offset_t  page_offset,
+       const void              *data,
+       int                     *validated_p,
+       int                     *tainted_p,
+       int                     *nx_p)
+{
+       vm_size_t offset_in_page;
+       struct cs_blob *blobs;
+
+       blobs = ubc_get_cs_blobs(vp);
+
+#if CONFIG_SUPPLEMENTAL_SIGNATURES
+       if (blobs == NULL && proc_is_translated(current_proc())) {
+               struct cs_blob *supp = ubc_get_cs_supplement(vp);
+
+               if (supp != NULL) {
+                       blobs = supp;
+               }
+       }
+#endif
+
+       *validated_p = VMP_CS_ALL_FALSE;
+       *tainted_p = VMP_CS_ALL_FALSE;
+       *nx_p = VMP_CS_ALL_FALSE;
+
+       for (offset_in_page = 0;
+           offset_in_page < PAGE_SIZE;
+           /* offset_in_page updated based on bytes processed */) {
+               unsigned subrange_tainted = 0;
+               boolean_t subrange_validated;
+               vm_size_t bytes_processed = 0;
+               int sub_bit;
+
+               subrange_validated = cs_validate_hash(blobs,
+                   pager,
+                   page_offset + offset_in_page,
+                   (const void *)((const char *)data + offset_in_page),
+                   &bytes_processed,
+                   &subrange_tainted);
+
+               if (bytes_processed == 0) {
+                       /* 4k chunk not code-signed: try next one */
+                       offset_in_page += FOURK_PAGE_SIZE;
+                       continue;
+               }
+               if (offset_in_page == 0 &&
+                   bytes_processed > PAGE_SIZE - FOURK_PAGE_SIZE) {
+                       /* all processed: no 4k granularity */
+                       if (subrange_validated) {
+                               *validated_p = VMP_CS_ALL_TRUE;
+                       }
+                       if (subrange_tainted & CS_VALIDATE_TAINTED) {
+                               *tainted_p = VMP_CS_ALL_TRUE;
+                       }
+                       if (subrange_tainted & CS_VALIDATE_NX) {
+                               *nx_p = VMP_CS_ALL_TRUE;
+                       }
+                       break;
+               }
+               /* we only handle 4k or 16k code-signing granularity... */
+               assertf(bytes_processed <= FOURK_PAGE_SIZE,
+                   "vp %p blobs %p offset 0x%llx + 0x%llx bytes_processed 0x%llx\n",
+                   vp, blobs, (uint64_t)page_offset,
+                   (uint64_t)offset_in_page, (uint64_t)bytes_processed);
+               sub_bit = 1 << (offset_in_page >> FOURK_PAGE_SHIFT);
+               if (subrange_validated) {
+                       *validated_p |= sub_bit;
+               }
+               if (subrange_tainted & CS_VALIDATE_TAINTED) {
+                       *tainted_p |= sub_bit;
+               }
+               if (subrange_tainted & CS_VALIDATE_NX) {
+                       *nx_p |= sub_bit;
+               }
+               /* go to next 4k chunk */
+               offset_in_page += FOURK_PAGE_SIZE;
+       }
+
+       return;
+}
+
 int
 ubc_cs_getcdhash(
-       vnode_t         vp,
-       off_t           offset,
-       unsigned char   *cdhash)
+       vnode_t         vp,
+       off_t           offset,
+       unsigned char   *cdhash)
 {
-       struct cs_blob  *blobs, *blob;
-       off_t           rel_offset;
-       int             ret;
+       struct cs_blob  *blobs, *blob;
+       off_t           rel_offset;
+       int             ret;
 
        vnode_lock(vp);
 
        blobs = ubc_get_cs_blobs(vp);
        for (blob = blobs;
-            blob != NULL;
-            blob = blob->csb_next) {
+           blob != NULL;
+           blob = blob->csb_next) {
                /* compute offset relative to this blob */
                rel_offset = offset - blob->csb_base_offset;
                if (rel_offset >= blob->csb_start_offset &&
@@ -3617,7 +4714,12 @@ ubc_cs_getcdhash(
                ret = EBADEXEC; /* XXX any better error ? */
        } else {
                /* get the SHA1 hash of that blob */
-               bcopy(blob->csb_sha1, cdhash, sizeof (blob->csb_sha1));
+               ptrauth_utils_auth_blob_generic(blob->csb_cdhash,
+                   sizeof(blob->csb_cdhash),
+                   OS_PTRAUTH_DISCRIMINATOR("cs_blob.csb_cd_signature"),
+                   PTRAUTH_ADDR_DIVERSIFY,
+                   blob->csb_cdhash_signature);
+               bcopy(blob->csb_cdhash, cdhash, sizeof(blob->csb_cdhash));
                ret = 0;
        }
 
@@ -3626,9 +4728,55 @@ ubc_cs_getcdhash(
        return ret;
 }
 
+boolean_t
+ubc_cs_is_range_codesigned(
+       vnode_t                 vp,
+       mach_vm_offset_t        start,
+       mach_vm_size_t          size)
+{
+       struct cs_blob          *csblob;
+       mach_vm_offset_t        blob_start;
+       mach_vm_offset_t        blob_end;
+
+       if (vp == NULL) {
+               /* no file: no code signature */
+               return FALSE;
+       }
+       if (size == 0) {
+               /* no range: no code signature */
+               return FALSE;
+       }
+       if (start + size < start) {
+               /* overflow */
+               return FALSE;
+       }
+
+       csblob = ubc_cs_blob_get(vp, -1, -1, start);
+       if (csblob == NULL) {
+               return FALSE;
+       }
+
+       /*
+        * We currently check if the range is covered by a single blob,
+        * which should always be the case for the dyld shared cache.
+        * If we ever want to make this routine handle other cases, we
+        * would have to iterate if the blob does not cover the full range.
+        */
+       blob_start = (mach_vm_offset_t) (csblob->csb_base_offset +
+           csblob->csb_start_offset);
+       blob_end = (mach_vm_offset_t) (csblob->csb_base_offset +
+           csblob->csb_end_offset);
+       if (blob_start > start || blob_end < (start + size)) {
+               /* range not fully covered by this code-signing blob */
+               return FALSE;
+       }
+
+       return TRUE;
+}
+
 #if CHECK_CS_VALIDATION_BITMAP
-#define stob(s)        ((atop_64((s)) + 07) >> 3)
-extern boolean_t       root_fs_upgrade_try;
+#define stob(s) (((atop_64(round_page_64(s))) + 07) >> 3)
+extern  boolean_t       root_fs_upgrade_try;
 
 /*
  * Should we use the code-sign bitmap to avoid repeated code-sign validation?
@@ -3637,30 +4785,30 @@ extern  boolean_t       root_fs_upgrade_try;
  * b) Has someone tried to mount the root filesystem read-write?
  * If answers are (a) yes AND (b) no, then we can use the bitmap.
  */
-#define USE_CODE_SIGN_BITMAP(vp)       ( (vp != NULL) && (vp->v_mount != NULL) && (vp->v_mount->mnt_flag & MNT_ROOTFS) && !root_fs_upgrade_try) 
+#define USE_CODE_SIGN_BITMAP(vp)        ( (vp != NULL) && (vp->v_mount != NULL) && (vp->v_mount->mnt_flag & MNT_ROOTFS) && !root_fs_upgrade_try)
 kern_return_t
 ubc_cs_validation_bitmap_allocate(
-       vnode_t         vp)
+       vnode_t         vp)
 {
-       kern_return_t   kr = KERN_SUCCESS;
+       kern_return_t   kr = KERN_SUCCESS;
        struct ubc_info *uip;
-       char            *target_bitmap;
-       vm_object_size_t        bitmap_size;
+       char            *target_bitmap;
+       vm_object_size_t        bitmap_size;
 
-       if ( ! USE_CODE_SIGN_BITMAP(vp) || (! UBCINFOEXISTS(vp))) {
+       if (!USE_CODE_SIGN_BITMAP(vp) || (!UBCINFOEXISTS(vp))) {
                kr = KERN_INVALID_ARGUMENT;
        } else {
                uip = vp->v_ubcinfo;
 
-               if ( uip->cs_valid_bitmap == NULL ) {
+               if (uip->cs_valid_bitmap == NULL) {
                        bitmap_size = stob(uip->ui_size);
-                       target_bitmap = (char*) kalloc( (vm_size_t)bitmap_size );
+                       target_bitmap = (char*) kalloc((vm_size_t)bitmap_size );
                        if (target_bitmap == 0) {
                                kr = KERN_NO_SPACE;
                        } else {
                                kr = KERN_SUCCESS;
                        }
-                       if( kr == KERN_SUCCESS ) {
+                       if (kr == KERN_SUCCESS) {
                                memset( target_bitmap, 0, (size_t)bitmap_size);
                                uip->cs_valid_bitmap = (void*)target_bitmap;
                                uip->cs_valid_bitmap_size = bitmap_size;
@@ -3671,30 +4819,29 @@ ubc_cs_validation_bitmap_allocate(
 }
 
 kern_return_t
-ubc_cs_check_validation_bitmap (
-       vnode_t                 vp,
-       memory_object_offset_t          offset,
-       int                     optype)
+ubc_cs_check_validation_bitmap(
+       vnode_t                 vp,
+       memory_object_offset_t          offset,
+       int                     optype)
 {
-       kern_return_t   kr = KERN_SUCCESS;
+       kern_return_t   kr = KERN_SUCCESS;
 
-       if ( ! USE_CODE_SIGN_BITMAP(vp) || ! UBCINFOEXISTS(vp)) {
+       if (!USE_CODE_SIGN_BITMAP(vp) || !UBCINFOEXISTS(vp)) {
                kr = KERN_INVALID_ARGUMENT;
        } else {
                struct ubc_info *uip = vp->v_ubcinfo;
-               char            *target_bitmap = uip->cs_valid_bitmap;
+               char            *target_bitmap = uip->cs_valid_bitmap;
 
-               if ( target_bitmap == NULL ) {
-                      kr = KERN_INVALID_ARGUMENT;
+               if (target_bitmap == NULL) {
+                       kr = KERN_INVALID_ARGUMENT;
                } else {
-                       uint64_t        bit, byte;
+                       uint64_t        bit, byte;
                        bit = atop_64( offset );
                        byte = bit >> 3;
 
-                       if ( byte > uip->cs_valid_bitmap_size ) {
-                              kr = KERN_INVALID_ARGUMENT;
+                       if (byte > uip->cs_valid_bitmap_size) {
+                               kr = KERN_INVALID_ARGUMENT;
                        } else {
-
                                if (optype == CS_BITMAP_SET) {
                                        target_bitmap[byte] |= (1 << (bit & 07));
                                        kr = KERN_SUCCESS;
@@ -3702,7 +4849,7 @@ ubc_cs_check_validation_bitmap (
                                        target_bitmap[byte] &= ~(1 << (bit & 07));
                                        kr = KERN_SUCCESS;
                                } else if (optype == CS_BITMAP_CHECK) {
-                                       if ( target_bitmap[byte] & (1 << (bit & 07))) {
+                                       if (target_bitmap[byte] & (1 << (bit & 07))) {
                                                kr = KERN_SUCCESS;
                                        } else {
                                                kr = KERN_FAILURE;
@@ -3716,16 +4863,16 @@ ubc_cs_check_validation_bitmap (
 
 void
 ubc_cs_validation_bitmap_deallocate(
-       vnode_t         vp)
+       vnode_t         vp)
 {
        struct ubc_info *uip;
-       void            *target_bitmap;
-       vm_object_size_t        bitmap_size;
+       void            *target_bitmap;
+       vm_object_size_t        bitmap_size;
 
-       if ( UBCINFOEXISTS(vp)) {
+       if (UBCINFOEXISTS(vp)) {
                uip = vp->v_ubcinfo;
 
-               if ( (target_bitmap = uip->cs_valid_bitmap) != NULL ) {
+               if ((target_bitmap = uip->cs_valid_bitmap) != NULL) {
                        bitmap_size = uip->cs_valid_bitmap_size;
                        kfree( target_bitmap, (vm_size_t) bitmap_size );
                        uip->cs_valid_bitmap = NULL;
@@ -3733,19 +4880,25 @@ ubc_cs_validation_bitmap_deallocate(
        }
 }
 #else
-kern_return_t  ubc_cs_validation_bitmap_allocate(__unused vnode_t vp){
+kern_return_t
+ubc_cs_validation_bitmap_allocate(__unused vnode_t vp)
+{
        return KERN_INVALID_ARGUMENT;
 }
 
-kern_return_t ubc_cs_check_validation_bitmap(
-       __unused struct vnode *vp, 
+kern_return_t
+ubc_cs_check_validation_bitmap(
+       __unused struct vnode *vp,
        __unused memory_object_offset_t offset,
-       __unused int optype){
-
+       __unused int optype)
+{
        return KERN_INVALID_ARGUMENT;
 }
 
-void   ubc_cs_validation_bitmap_deallocate(__unused vnode_t vp){
+void
+ubc_cs_validation_bitmap_deallocate(__unused vnode_t vp)
+{
        return;
 }
 #endif /* CHECK_CS_VALIDATION_BITMAP */
+