From owner-trustedbsd-cvs@FreeBSD.ORG Mon Jan 22 15:34:00 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 6865316A407 for ; Mon, 22 Jan 2007 15:34:00 +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 5CAC513C467 for ; Mon, 22 Jan 2007 15:33:58 +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 5C1E047AC1 for ; Mon, 22 Jan 2007 10:33:52 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [69.147.83.54]) by mx2.freebsd.org (Postfix) with ESMTP id 1FFE763C46; Mon, 22 Jan 2007 15:30:53 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 17A0916A40B; Mon, 22 Jan 2007 15:30:53 +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 C682216A402 for ; Mon, 22 Jan 2007 15:30:52 +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 B592113C467 for ; Mon, 22 Jan 2007 15:30:52 +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 l0MFUqpB010939 for ; Mon, 22 Jan 2007 15:30:52 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MFUq6K010936 for perforce@freebsd.org; Mon, 22 Jan 2007 15:30:52 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 15:30:52 GMT Message-Id: <200701221530.l0MFUq6K010936@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 113326 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:34:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=113326 Change 113326 by millert@millert_macbook on 2007/01/22 15:30:20 Replace calls to network_label_copy() with sebsd_label_copy() now that we don't have to check for unlabeled mbufs. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#61 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#61 (text+ko) ==== @@ -154,19 +154,10 @@ } static void -network_label_copy(struct label *slabel, struct label *dlabel) +sebsd_label_copy(struct label *src, struct label *dest) { - struct network_security_struct *src, *dst; - if (slabel == NULL || dlabel == NULL) - return; - - src = SLOT(slabel); - dst = SLOT(dlabel); - if (src == NULL || dst == NULL) - return; - - *dst = *src; + *(struct sebsd_label *)SLOT(dest) = *(struct sebsd_label *)SLOT(src); } /* @@ -930,7 +921,7 @@ struct mbuf *m, struct label *mlabel) { - network_label_copy(blabel, mlabel); + sebsd_label_copy(blabel, mlabel); } static void @@ -938,7 +929,7 @@ struct mbuf *m, struct label *mlabel) { - network_label_copy(ilabel, mlabel); + sebsd_label_copy(ilabel, mlabel); } static void @@ -1137,7 +1128,7 @@ struct mbuf *m, struct label *mlabel) { - network_label_copy(solabel, mlabel); + sebsd_label_copy(solabel, mlabel); } static void @@ -1201,7 +1192,7 @@ struct xsocket *news, struct label *newslabel) { - network_label_copy(oldslabel, newslabel); + sebsd_label_copy(oldslabel, newslabel); } static int @@ -1812,7 +1803,7 @@ struct label *oldlabel, struct label *newlabel) { - network_label_copy(newlabel, oldlabel); + sebsd_label_copy(newlabel, oldlabel); } static void @@ -1853,7 +1844,7 @@ struct xsocket *xso, struct label *sopeerlabel) { - network_label_copy(mlabel, sopeerlabel); + sebsd_label_copy(mlabel, sopeerlabel); } static void @@ -1862,7 +1853,7 @@ struct label *newsockpeerlabel) { - network_label_copy(oldslabel, newsockpeerlabel); + sebsd_label_copy(oldslabel, newsockpeerlabel); } static int @@ -2926,13 +2917,6 @@ return (sebsd_externalize_sid(sid, element_name, sb)); } -static void -sebsd_label_copy(struct label *src, struct label *dest) -{ - - *(struct sebsd_label *)SLOT(dest) = *(struct sebsd_label *)SLOT(src); -} - #ifdef FD__CREATE static int sebsd_file_check_create(struct ucred *cred) @@ -3041,7 +3025,7 @@ struct label *ifnetlabel, struct label *newlabel) { - network_label_copy(newlabel, ifnetlabel); + sebsd_label_copy(newlabel, ifnetlabel); } static void @@ -3096,19 +3080,9 @@ struct network_security_struct *ifsec, *msec; int error; - if (ifnetlabel == NULL || mbuflabel == NULL) { - /* XXX - mbufs are not always labeled! */ - return (0); - } - ifsec = SLOT(ifnetlabel); msec = SLOT(mbuflabel); - if (ifsec == NULL || msec == NULL) { - /* XXX - should not happen, log and fix */ - return (0); - } - /* XXX - use an audit struct so we can log useful info */ error = avc_has_perm(msec->sid, ifsec->sid, SECCLASS_PACKET, PACKET__SEND, NULL); @@ -3504,7 +3478,7 @@ .mpo_mbuf_label_associate_bpfdesc = sebsd_mbuf_label_associate_bpfdesc, .mpo_mbuf_label_associate_ifnet = sebsd_mbuf_label_associate_ifnet, .mpo_mbuf_label_associate_socket = sebsd_mbuf_label_associate_socket, - .mpo_mbuf_label_copy = network_label_copy, + .mpo_mbuf_label_copy = sebsd_label_copy, .mpo_mbuf_label_destroy = sebsd_label_destroy, .mpo_mbuf_label_init = sebsd_label_init2, .mpo_mount_check_getattr = sebsd_mount_check_getattr, @@ -3594,7 +3568,7 @@ .mpo_socket_check_stat = sebsd_socket_check_stat, .mpo_socket_label_associate = sebsd_socket_label_associate, .mpo_socket_label_associate_accept = sebsd_socket_label_associate_accept, - .mpo_socket_label_copy = network_label_copy, + .mpo_socket_label_copy = sebsd_label_copy, .mpo_socket_label_destroy = sebsd_label_destroy, .mpo_socket_label_externalize = sebsd_label_externalize, .mpo_socket_label_init = sebsd_label_init2,