X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/2d21ac55c334faf3a56e5634905ed6987fc787d4..cc8bc92ae4a8e9f1a1ab61bf83d34ad8150b3405:/security/mac_alloc.c?ds=inline diff --git a/security/mac_alloc.c b/security/mac_alloc.c index 8cd41403d..7c19ae14a 100644 --- a/security/mac_alloc.c +++ b/security/mac_alloc.c @@ -84,6 +84,7 @@ mac_kfree(void * data, vm_size_t size) void * mac_mbuf_alloc(int len, int wait) { +#if CONFIG_MACF_SOCKET_SUBSET struct m_tag *t; t = m_tag_alloc(KERNEL_MODULE_TAG_ID, KERNEL_TAG_TYPE_MAC_POLICY_LABEL, @@ -92,15 +93,23 @@ mac_mbuf_alloc(int len, int wait) return (NULL); return ((void *)(t + 1)); +#else +#pragma unused(len, wait) + return NULL; +#endif } void mac_mbuf_free(void *data) { +#if CONFIG_MACF_SOCKET_SUBSET struct m_tag *t; t = (struct m_tag *)((char *)data - sizeof(struct m_tag)); m_tag_free(t); +#else +#pragma unused(data) +#endif } /* @@ -113,8 +122,8 @@ int mac_wire(void *start, void *end) { - return (vm_map_wire(kalloc_map, CAST_USER_ADDR_T(start), - CAST_USER_ADDR_T(end), VM_PROT_READ|VM_PROT_WRITE, FALSE)); + return (vm_map_wire_kernel(kalloc_map, CAST_USER_ADDR_T(start), + CAST_USER_ADDR_T(end), VM_PROT_READ|VM_PROT_WRITE, VM_KERN_MEMORY_SECURITY, FALSE)); } int