From owner-trustedbsd-cvs@FreeBSD.ORG Mon Jan 22 16:23:29 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 8476516A409 for ; Mon, 22 Jan 2007 16:23:29 +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 E6D5513C461 for ; Mon, 22 Jan 2007 16:23:27 +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 9166449298 for ; Mon, 22 Jan 2007 11:23:25 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [69.147.83.54]) by mx2.freebsd.org (Postfix) with ESMTP id 7411DCFE94; Mon, 22 Jan 2007 16:23:23 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 4620916A401; Mon, 22 Jan 2007 16:23:19 +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 2378916A52F for ; Mon, 22 Jan 2007 16:23:19 +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 DCC4613C4BA for ; Mon, 22 Jan 2007 16:23:18 +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 l0MGNIDX031254 for ; Mon, 22 Jan 2007 16:23:18 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MGNIbu031248 for perforce@freebsd.org; Mon, 22 Jan 2007 16:23:18 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 16:23:18 GMT Message-Id: <200701221623.l0MGNIbu031248@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 113363 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 16:23:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=113363 Change 113363 by millert@millert_macbook on 2007/01/22 16:23:09 Adapt to mac_ifnet_check_transmit() and mac_inpcb_check_deliver() API change. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#75 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#75 (text+ko) ==== @@ -3125,18 +3125,33 @@ #endif static int -sebsd_ifnet_check_transmit(struct ifnet *ifp, - struct label *ifnetlabel, struct mbuf *m, struct label *mbuflabel) +sebsd_ifnet_check_transmit(struct ifnet *ifp, struct label *ifnetlabel, + struct mbuf *m, struct label *mbuflabel, int family, int type) { struct network_security_struct *ifsec, *msec; + u_int32_t perm; int error; ifsec = SLOT(ifnetlabel); msec = SLOT(mbuflabel); + /* XXX - other types of perm, see selinux_sock_rcv_skb_compat() */ + switch (type) { + case SOCK_STREAM: + perm = NETIF__TCP_SEND; + break; + case SOCK_DGRAM: + perm = NETIF__UDP_SEND; + break; + case SOCK_RAW: + default: + perm = NETIF__RAWIP_SEND; + break; + } + /* XXX - use an audit struct so we can log useful info */ - error = avc_has_perm(msec->sid, ifsec->sid, SECCLASS_PACKET, - PACKET__SEND, NULL); + error = avc_has_perm(msec->sid, ifsec->sid, SECCLASS_NETIF, + perm, NULL); return (error); } @@ -3157,18 +3172,33 @@ } static int -sebsd_inpcb_check_deliver(struct inpcb *inp, - struct label *inplabel, struct mbuf *m, struct label *mbuflabel) +sebsd_inpcb_check_deliver(struct inpcb *inp, struct label *inplabel, + struct mbuf *m, struct label *mbuflabel, int family, int type) { struct network_security_struct *ifsec, *msec; + u_int32_t perm; int error; ifsec = SLOT(inplabel); msec = SLOT(mbuflabel); + /* XXX - other types of perm, see selinux_sock_rcv_skb_compat() */ + switch (type) { + case SOCK_STREAM: + perm = NETIF__TCP_RECV; + break; + case SOCK_DGRAM: + perm = NETIF__UDP_RECV; + break; + case SOCK_RAW: + default: + perm = NETIF__RAWIP_RECV; + break; + } + /* XXX - use an audit struct so we can log useful info */ - error = avc_has_perm(msec->sid, ifsec->sid, SECCLASS_PACKET, - PACKET__RECV, NULL); + error = avc_has_perm(msec->sid, ifsec->sid, SECCLASS_NETIF, + perm, NULL); return (error); }