From owner-trustedbsd-cvs@FreeBSD.ORG Mon Jan 22 15:49:26 2007 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A618A16A402 for ; Mon, 22 Jan 2007 15:49:26 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.freebsd.org (Postfix) with ESMTP id 43B3913C4B7 for ; Mon, 22 Jan 2007 15:49:25 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [69.147.83.53]) by cyrus.watson.org (Postfix) with ESMTP id 7221147ABE for ; Mon, 22 Jan 2007 10:49:22 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [69.147.83.54]) by mx2.freebsd.org (Postfix) with ESMTP id C82285BE8A; Mon, 22 Jan 2007 15:46:16 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id BEFDF16A403; Mon, 22 Jan 2007 15:46:16 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7DB1B16A401 for ; Mon, 22 Jan 2007 15:46:16 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6BDE313C469 for ; Mon, 22 Jan 2007 15:46:16 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0MFkGsT022315 for ; Mon, 22 Jan 2007 15:46:16 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MFkFhZ022310 for perforce@freebsd.org; Mon, 22 Jan 2007 15:46:15 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 15:46:15 GMT Message-Id: <200701221546.l0MFkFhZ022310@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 113333 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jan 2007 15:49:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=113333 Change 113333 by millert@millert_macbook on 2007/01/22 15:45:28 Add mac_mbuf_label_associate_netlayer(). Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/ip_icmp.c#7 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#32 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_net.c#10 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#40 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#64 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/ip_icmp.c#7 (text+ko) ==== @@ -231,11 +231,9 @@ m->m_flags |= M_SKIP_FIREWALL; } -#ifdef __darwin8_notyet #ifdef MAC mac_mbuf_label_associate_netlayer(n, m); #endif -#endif icmplen = min(oiplen + 8, oip->ip_len); if (icmplen < sizeof(struct ip)) { printf("icmp_error: bad length\n"); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#32 (text+ko) ==== @@ -177,6 +177,8 @@ void mac_mbuf_label_associate_ifnet(struct ifnet *ifp, struct mbuf *m); void mac_mbuf_label_associate_inpcb(struct inpcb *inp, struct mbuf *m); void mac_mbuf_label_associate_linklayer(struct ifnet *ifp, struct mbuf *m); +void mac_mbuf_label_associate_netlayer(struct mbuf *oldmbuf, + struct mbuf *newmbuf); void mac_mbuf_label_associate_socket(struct socket *so, struct mbuf *m); void mac_mbuf_label_copy(struct mbuf *m_from, struct mbuf *m_to); void mac_mbuf_label_destroy(struct mbuf *m); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_net.c#10 (text+ko) ==== @@ -310,7 +310,6 @@ m_label = mac_mbuf_to_label(mbuf); b_label = mac_bpfdesc_label_get(bpf_d); - /* Policy must deal with NULL label (unlabeled mbufs) */ MAC_PERFORM(mbuf_label_associate_bpfdesc, bpf_d, b_label, mbuf, m_label); } @@ -324,7 +323,6 @@ m_label = mac_mbuf_to_label(mbuf); - /* Policy must deal with NULL label (unlabeled mbufs) */ MAC_PERFORM(mbuf_label_associate_ifnet, ifp, ifp->if_label, mbuf, m_label); } @@ -338,12 +336,23 @@ m_label = mac_mbuf_to_label(mbuf); - /* Policy must deal with NULL label (unlabeled mbufs) */ MAC_PERFORM(mbuf_label_associate_linklayer, ifp, ifp->if_label, mbuf, m_label); } void +mac_mbuf_label_associate_netlayer(struct mbuf *oldmbuf, struct mbuf *newmbuf) +{ + struct label *oldmbuflabel, *newmbuflabel; + + oldmbuflabel = mac_mbuf_to_label(oldmbuf); + newmbuflabel = mac_mbuf_to_label(newmbuf); + + MAC_PERFORM(mbuf_label_associate_netlayer, oldmbuf, oldmbuflabel, + newmbuf, newmbuflabel); +} + +void mac_mbuf_label_associate_socket(struct socket *socket, struct mbuf *mbuf) { struct label *label; @@ -353,7 +362,6 @@ label = mac_mbuf_to_label(mbuf); - /* Policy must deal with NULL label (unlabeled mbufs) */ sotoxsocket(socket, &xso); MAC_PERFORM(mbuf_label_associate_socket, &xso, socket->so_label, mbuf, label); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#40 (text+ko) ==== @@ -1328,6 +1328,24 @@ struct label *m_label ); /** + @brief Assign a label to a new mbuf + @param oldmbuf Received datagram + @param oldmbuflabel Policy label for oldmbuf + @param newmbuf Newly created datagram + @param newmbuflabel Policy label for newmbuf + + Set the label on the mbuf header of a newly created datagram generated + by the IP stack in response to an existing received datagram (oldmbuf). + This call may be made in a number of situations, including when responding + to ICMP request datagrams. +*/ +typedef void mpo_mbuf_label_associate_netlayer_t( + struct mbuf *oldmbuf, + struct label *oldmbuflabel, + struct mbuf *newmbuf, + struct label *newmbuflabel +); +/** @brief Assign a label to a new mbuf @param xso Socket to label @param so_label Policy label for socket @@ -5385,6 +5403,7 @@ mpo_mbuf_label_associate_ifnet_t *mpo_mbuf_label_associate_ifnet; mpo_mbuf_label_associate_inpcb_t *mpo_mbuf_label_associate_inpcb; mpo_mbuf_label_associate_linklayer_t *mpo_mbuf_label_associate_linklayer; + mpo_mbuf_label_associate_netlayer_t *mpo_mbuf_label_associate_netlayer; mpo_mbuf_label_associate_socket_t *mpo_mbuf_label_associate_socket; mpo_mbuf_label_copy_t *mpo_mbuf_label_copy; mpo_mbuf_label_destroy_t *mpo_mbuf_label_destroy; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#64 (text+ko) ==== @@ -933,6 +933,15 @@ } static void +sebsd_mbuf_label_associate_netlayer(struct mbuf *oldmbuf, + struct label *oldmbuflabel, struct mbuf *newmbuf, + struct label *newmbuflabel) +{ + + sebsd_label_copy(oldmbuflabel, newmbuflabel); +} + +static void sebsd_mbuf_label_associate_inpcb(struct inpcb *inp, struct label *ilabel, struct mbuf *m, struct label *mlabel) { @@ -3524,6 +3533,7 @@ .mpo_mbuf_label_associate_ifnet = sebsd_mbuf_label_associate_ifnet, .mpo_mbuf_label_associate_inpcb = sebsd_mbuf_label_associate_inpcb, .mpo_mbuf_label_associate_linklayer = sebsd_mbuf_label_associate_ifnet, + .mpo_mbuf_label_associate_netlayer = sebsd_mbuf_label_associate_netlayer, .mpo_mbuf_label_associate_socket = sebsd_mbuf_label_associate_socket, .mpo_mbuf_label_copy = sebsd_label_copy, .mpo_mbuf_label_destroy = sebsd_label_destroy,