X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/ff6e181ae92fc6f1e89841290f461d1f2f9badd9..cf7d32b81c573a0536dc4da4157f9c26f8d0bed3:/bsd/kern/uipc_mbuf2.c diff --git a/bsd/kern/uipc_mbuf2.c b/bsd/kern/uipc_mbuf2.c index f534e0668..d5ea69c86 100644 --- a/bsd/kern/uipc_mbuf2.c +++ b/bsd/kern/uipc_mbuf2.c @@ -1,14 +1,19 @@ /* - * Copyright (c) 2000 Apple Computer, Inc. All rights reserved. + * Copyright (c) 2000-2007 Apple Inc. All rights reserved. * - * @APPLE_LICENSE_HEADER_START@ + * @APPLE_OSREFERENCE_LICENSE_HEADER_START@ * * This file contains Original Code and/or Modifications of Original Code * as defined in and that are subject to the Apple Public Source License * Version 2.0 (the 'License'). You may not use this file except in - * compliance with the License. Please obtain a copy of the License at - * http://www.opensource.apple.com/apsl/ and read it before using this - * file. + * compliance with the License. The rights granted to you under the License + * may not be used to create, or enable the creation or redistribution of, + * unlawful or unlicensed copies of an Apple operating system, or to + * circumvent, violate, or enable the circumvention or violation of, any + * terms of an Apple operating system software license agreement. + * + * Please obtain a copy of the License at + * http://www.opensource.apple.com/apsl/ and read it before using this file. * * The Original Code and all software distributed under the License are * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER @@ -18,7 +23,7 @@ * Please see the License for the specific language governing rights and * limitations under the License. * - * @APPLE_LICENSE_HEADER_END@ + * @APPLE_OSREFERENCE_LICENSE_HEADER_END@ */ /* $NetBSD: uipc_mbuf.c,v 1.40 1999/04/01 00:23:25 thorpej Exp $ */ @@ -85,6 +90,12 @@ * * @(#)uipc_mbuf.c 8.4 (Berkeley) 2/14/95 */ +/* + * NOTICE: This file was modified by SPARTA, Inc. in 2005 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 2.0. + */ /*#define PULLDOWN_DEBUG*/ @@ -100,6 +111,10 @@ #include #endif +#if CONFIG_MACF_NET +#include +#endif + /* * ensure that [off, off + len) is contiguous on the mbuf chain "m". * packet chain before "off" is kept untouched. @@ -111,10 +126,7 @@ * XXX M_TRAILINGSPACE/M_LEADINGSPACE on shared cluster (sharedcluster) */ struct mbuf * -m_pulldown(m, off, len, offp) - struct mbuf *m; - int off, len; - int *offp; +m_pulldown(struct mbuf *m, int off, int len, int *offp) { struct mbuf *n, *o; int hlen, tlen, olen; @@ -353,87 +365,6 @@ ok: return n; } -/* - * pkthdr.aux chain manipulation. - * we don't allow clusters at this moment. - */ -struct mbuf * -m_aux_add(m, af, type) - struct mbuf *m; - int af, type; -{ - struct mbuf *n; - struct mauxtag *t; - - if ((m->m_flags & M_PKTHDR) == 0) - return NULL; - - n = m_aux_find(m, af, type); - if (n) - return n; - - MGET(n, M_DONTWAIT, m->m_type); - if (n == NULL) - return NULL; - - t = mtod(n, struct mauxtag *); - t->af = af; - t->type = type; - n->m_data += sizeof(struct mauxtag); - n->m_len = 0; - n->m_next = m->m_pkthdr.aux; - m->m_pkthdr.aux = n; - return n; -} - -struct mbuf * -m_aux_find(m, af, type) - struct mbuf *m; - int af, type; -{ - struct mbuf *n; - struct mauxtag *t; - - if ((m->m_flags & M_PKTHDR) == 0) - return NULL; - - for (n = m->m_pkthdr.aux; n; n = n->m_next) { - t = (struct mauxtag *)n->m_dat; - if (t->af == af && t->type == type) - return n; - } - return NULL; -} - -void -m_aux_delete(m, victim) - struct mbuf *m; - struct mbuf *victim; -{ - struct mbuf *n, *prev, *next; - struct mauxtag *t; - - if ((m->m_flags & M_PKTHDR) == 0) - return; - - prev = NULL; - n = m->m_pkthdr.aux; - while (n) { - t = (struct mauxtag *)n->m_dat; - next = n->m_next; - if (n == victim) { - if (prev) - prev->m_next = n->m_next; - else - m->m_pkthdr.aux = n->m_next; - n->m_next = NULL; - m_free(n); - } else - prev = n; - n = next; - } -} - /* Get a packet tag structure along with specified data following. */ struct m_tag * m_tag_alloc(u_int32_t id, u_int16_t type, int len, int wait) @@ -450,9 +381,9 @@ m_tag_alloc(u_int32_t id, u_int16_t type, int len, int wait) struct mbuf *m = m_get(wait, MT_TAG); if (m == NULL) return NULL; - t = (struct m_tag *) m->m_dat; + t = mtod(m, struct m_tag *); } else if (len + sizeof(struct m_tag) <= MCLBYTES) { - MCLALLOC((caddr_t)t, wait); + t = (struct m_tag *) m_mclalloc(wait); } else t = NULL; #endif @@ -469,13 +400,19 @@ m_tag_alloc(u_int32_t id, u_int16_t type, int len, int wait) void m_tag_free(struct m_tag *t) { +#if CONFIG_MACF_NET + if (t != NULL && + t->m_tag_id == KERNEL_MODULE_TAG_ID && + t->m_tag_type == KERNEL_TAG_TYPE_MACLABEL) + mac_mbuf_tag_destroy(t); +#endif #ifndef __APPLE__ free(t, M_PACKET_TAGS); #else /* FREE(t, M_TEMP); */ if (t == NULL) return; - if (t->m_tag_len <= MLEN) { + if (t->m_tag_len + sizeof(struct m_tag) <= MLEN) { struct mbuf * m = m_dtom(t); m_free(m); } else { @@ -556,6 +493,22 @@ m_tag_copy(struct m_tag *t, int how) p = m_tag_alloc(t->m_tag_id, t->m_tag_type, t->m_tag_len, how); if (p == NULL) return (NULL); +#if CONFIG_MACF_NET + /* + * XXXMAC: we should probably pass off the initialization, and + * copying here? can we hid that KERNEL_TAG_TYPE_MACLABEL is + * special from the mbuf code? + */ + if (t != NULL && + t->m_tag_id == KERNEL_MODULE_TAG_ID && + t->m_tag_type == KERNEL_TAG_TYPE_MACLABEL) { + if (mac_mbuf_tag_init(p, how) != 0) { + m_tag_free(p); + return (NULL); + } + mac_mbuf_tag_copy(t, p); + } else +#endif bcopy(t + 1, p + 1, t->m_tag_len); /* Copy the data */ return p; }