From owner-trustedbsd-cvs@FreeBSD.ORG Mon Jan 22 16:01:48 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 8398E16A404 for ; Mon, 22 Jan 2007 16:01:48 +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 BD6DD13C45E for ; Mon, 22 Jan 2007 16:01:45 +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 C27B049556 for ; Mon, 22 Jan 2007 11:01:42 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [69.147.83.54]) by mx2.freebsd.org (Postfix) with ESMTP id A77FB57E3F; Mon, 22 Jan 2007 16:01:40 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 9F4ED16A407; Mon, 22 Jan 2007 16:01:40 +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 4DC0616A404 for ; Mon, 22 Jan 2007 16:01:40 +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 3CBB213C465 for ; Mon, 22 Jan 2007 16:01:40 +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 l0MG1em8025068 for ; Mon, 22 Jan 2007 16:01:40 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MG1eXG025053 for perforce@freebsd.org; Mon, 22 Jan 2007 16:01:40 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 16:01:40 GMT Message-Id: <200701221601.l0MG1eXG025053@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 113342 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:01:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=113342 Change 113342 by millert@millert_macbook on 2007/01/22 16:01:13 Use security_netif_sid() to get the sid for a network interface based on its name. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#68 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd_labels.h#7 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#68 (text+ko) ==== @@ -72,6 +72,8 @@ #include #include +#include + #include #include #include @@ -933,6 +935,14 @@ } static void +sebsd_mbuf_label_associate_linklayer(struct ifnet *ifn, struct label *ilabel, + struct mbuf *m, struct label *mlabel) +{ + + sebsd_label_copy(ilabel, mlabel); +} + +static void sebsd_mbuf_label_associate_netlayer(struct mbuf *oldmbuf, struct label *oldmbuflabel, struct mbuf *newmbuf, struct label *newmbuflabel) @@ -3061,14 +3071,13 @@ sebsd_ifnet_label_associate(struct ifnet *ifp, struct label *ifnetlabel) { struct network_security_struct *nsec; + u_int32_t msg_sid; - /* - * We just set the label to a default value and require that - * the system set a more specific value at ifconfig time. - */ nsec = SLOT(ifnetlabel); + /* XXX - should not need NULL check */ if (nsec != NULL) { - nsec->sid = SECINITSID_NETIF; + /* NOTE: msg_sid has been deprecated and is unused. */ + security_netif_sid(ifnet_name(ifp), &nsec->sid, &msg_sid); nsec->sclass = SECCLASS_NETIF; } } @@ -3587,7 +3596,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_ipq = sebsd_mbuf_label_associate_ipq, - .mpo_mbuf_label_associate_linklayer = sebsd_mbuf_label_associate_ifnet, + .mpo_mbuf_label_associate_linklayer = sebsd_mbuf_label_associate_linklayer, .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, ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd_labels.h#7 (text+ko) ==== @@ -47,8 +47,9 @@ u_int16_t sclass; u_int16_t behavior; /* only used for mount */ }; -#define task_sid osid /* XXX - need to be separate if polymorphic */ +#define task_sid osid +/* Subsystem-specific label structs are used for improved readability */ #define task_security_struct sebsd_label #define file_security_struct sebsd_label #define vnode_security_struct sebsd_label