From owner-p4-projects@FreeBSD.ORG Thu Nov 16 19:11:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6587416A415; Thu, 16 Nov 2006 19:11:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2406016A407 for ; Thu, 16 Nov 2006 19:11:36 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5BEAE43D7D for ; Thu, 16 Nov 2006 19:11:30 +0000 (GMT) (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 kAGJBT6e065390 for ; Thu, 16 Nov 2006 19:11:29 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAGJBTej065386 for perforce@freebsd.org; Thu, 16 Nov 2006 19:11:29 GMT (envelope-from millert@freebsd.org) Date: Thu, 16 Nov 2006 19:11:29 GMT Message-Id: <200611161911.kAGJBTej065386@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 110119 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Nov 2006 19:11:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=110119 Change 110119 by millert@millert_macbook on 2006/11/16 19:11:19 Update vanity policy with fdesc-related entrypoints Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/vanity/vanity.c#9 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/vanity/vanity.c#9 (text+ko) ==== @@ -3,6 +3,9 @@ #include #include +#include +#include +#include #include #include #include @@ -116,12 +119,58 @@ } static void +vanity_vnode_label_associate_file(struct ucred *cred, + struct mount *mp, struct label *mntlabel, + struct fileglob *fg, struct label *label, + struct vnode *vp, struct label *vlabel) +{ + if (vp->v_lflag & VL_LABELED) + v_print("VANITY: vanity_vnode_label_associate_file() already associated", vp); +} + +static void +vanity_vnode_label_associate_posixshm(struct ucred *cred, + struct pshminfo *pshm, struct label *pshmlabel, + struct vnode *vp, struct label *vlabel) +{ + if (vp->v_lflag & VL_LABELED) + v_print("VANITY: vanity_vnode_label_associate_posixshm() already associated", vp); +} + +static void +vanity_vnode_label_associate_posixsem(struct ucred *cred, + struct pseminfo *psem, struct label *psemlabel, + struct vnode *vp, struct label *vlabel) +{ + if (vp->v_lflag & VL_LABELED) + v_print("VANITY: vanity_vnode_label_associate_posixsem() already associated", vp); +} + +static void +vanity_vnode_label_associate_pipe(struct ucred *cred, + struct pipe *cpipe, struct label *pipelabel, + struct vnode *vp, struct label *vlabel) +{ + if (vp->v_lflag & VL_LABELED) + v_print("VANITY: vanity_vnode_label_associate_pipe() already associated", vp); +} + +static void vanity_vnode_label_associate_singlelabel(struct mount *mp, struct label *mntlabel, struct vnode *vp, struct label *vlabel) { if (vp->v_lflag & VL_LABELED) v_print("VANITY: vanity_vnode_label_associate_singlelabel() already associated", vp); } +static void +vanity_vnode_label_associate_socket(struct ucred *cred, + struct xsocket *xso, struct label *solabel, + struct vnode *vp, struct label *vlabel) +{ + if (vp->v_lflag & VL_LABELED) + v_print("VANITY: vanity_vnode_label_associate_socket() already associated", vp); +} + static int vanity_vnode_notify_create(struct ucred *cred, struct mount *mp, struct label *mntlabel, struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *vlabel, struct componentname *cnp) { @@ -476,7 +525,12 @@ .mpo_vnode_label_update_extattr = vanity_vnode_label_update_extattr, .mpo_vnode_label_associate_devfs= vanity_vnode_label_associate_devfs, .mpo_vnode_label_associate_extattr= vanity_vnode_label_associate_extattr, + .mpo_vnode_label_associate_file = vanity_vnode_label_associate_file, .mpo_vnode_label_associate_singlelabel= vanity_vnode_label_associate_singlelabel, + .mpo_vnode_label_associate_posixshm= vanity_vnode_label_associate_posixshm, + .mpo_vnode_label_associate_posixsem= vanity_vnode_label_associate_posixsem, + .mpo_vnode_label_associate_pipe = vanity_vnode_label_associate_pipe, + .mpo_vnode_label_associate_socket= vanity_vnode_label_associate_socket, .mpo_vnode_notify_create = vanity_vnode_notify_create, .mpo_vnode_label_update = vanity_vnode_label_update, .mpo_vnode_label_store = vanity_vnode_label_store,