From owner-trustedbsd-cvs@FreeBSD.ORG Mon Jan 22 15:57:50 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 E76C816A408 for ; Mon, 22 Jan 2007 15:57:50 +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 7698A13C4BE for ; Mon, 22 Jan 2007 15:57:50 +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 019384948C for ; Mon, 22 Jan 2007 10:57:45 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [69.147.83.54]) by mx2.freebsd.org (Postfix) with ESMTP id A3C5DCFF8C; Mon, 22 Jan 2007 15:53:31 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 8BB8116A4F8; Mon, 22 Jan 2007 15:53:27 +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 4E61516A475 for ; Mon, 22 Jan 2007 15:53:27 +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 3AFB913C44C for ; Mon, 22 Jan 2007 15:53:27 +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 l0MFrRXe023771 for ; Mon, 22 Jan 2007 15:53:27 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MFrQWk023767 for perforce@freebsd.org; Mon, 22 Jan 2007 15:53:26 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 15:53:26 GMT Message-Id: <200701221553.l0MFrQWk023767@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 113336 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:57:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=113336 Change 113336 by millert@millert_macbook on 2007/01/22 15:52:46 Implement mpo_socket_check_deliver, which is similar to mpo_inpcb_check_deliver (but for protocols w/o an inpcb). Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#66 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#66 (text+ko) ==== @@ -2662,16 +2662,21 @@ SOCKET__CREATE, NULL)); } -#if 0 static int -sebsd_socket_check_deliver(struct ucred *cred, struct xsocket *xso, - struct label *socklabel) +sebsd_socket_check_deliver(struct xsocket *xso, struct label *socklabel, + struct mbuf *m, struct label *mbuflabel) { + struct network_security_struct *nsec, *msec; + int error; + + nsec = SLOT(socklabel); + msec = SLOT(mbuflabel); - /* XXX - check for NULL socket label? */ - return (socket_has_perm(cred, socklabel, SOCKET__RECV)); + /* XXX - use an audit struct so we can log useful info */ + error = avc_has_perm(msec->sid, nsec->sid, SECCLASS_PACKET, + PACKET__RECV, NULL); + return (error); } -#endif #ifdef SOCKET__POLL static int @@ -3627,6 +3632,7 @@ .mpo_socket_check_bind = sebsd_socket_check_bind, .mpo_socket_check_connect = sebsd_socket_check_connect, .mpo_socket_check_create = sebsd_socket_check_create, + .mpo_socket_check_deliver = sebsd_socket_check_deliver, .mpo_socket_check_label_update = sebsd_socket_check_label_update, .mpo_socket_check_listen = sebsd_socket_check_listen, .mpo_socket_check_receive = sebsd_socket_check_receive,