From owner-p4-projects@FreeBSD.ORG Mon Jan 22 15:11:20 2007 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 C035F16A50F; Mon, 22 Jan 2007 15:11:20 +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 9A18916A468 for ; Mon, 22 Jan 2007 15:11:20 +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 7E84613C468 for ; Mon, 22 Jan 2007 15:11:20 +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 l0MFBKLU002938 for ; Mon, 22 Jan 2007 15:11:20 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MFBKl4002932 for perforce@freebsd.org; Mon, 22 Jan 2007 15:11:20 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 15:11:20 GMT Message-Id: <200701221511.l0MFBKl4002932@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 113319 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: Mon, 22 Jan 2007 15:11:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=113319 Change 113319 by millert@millert_macbook on 2007/01/22 15:10:57 - Add entry points for vnode_check_{list, delete}extattr - Add a comment to vnode_check_set, it doesn't look complete Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#58 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#58 (text+ko) ==== @@ -2086,6 +2086,34 @@ return (vnode_has_perm(cred, vp, NULL, FILE__GETATTR)); } +static int +sebsd_vnode_check_listextattr(struct ucred *cred, struct vnode *vp, + struct label *label) +{ + + return (vnode_has_perm(cred, vp, NULL, FILE__GETATTR)); +} + +static int +sebsd_vnode_check_deleteextattr(struct ucred *cred, struct vnode *vp, + struct label *label, const char *name) +{ + + /* + * Our policy labels may not be removed. + * Labels may be changed, but all files must be labeled. + */ + if (bcmp(name, SEBSD_MAC_EXTATTR_NAME, + sizeof(SEBSD_MAC_EXTATTR_NAME)) == 0) + return (EPERM); + + /* + * Otherwise, it's not a recognized attribute and we do as + * SELinux does and check ordinary setattr permissions. + */ + return (vnode_has_perm(cred, vp, NULL, FILE__SETATTR)); +} + #if defined(FILE__POLL) && defined(FILE__GETATTR) static int sebsd_vnode_check_kqfilter(struct ucred *cred, struct ucred *file_cred, @@ -2386,6 +2414,14 @@ struct label *label, const char *name, struct uio *uio) { + /* + * XXX - This doesn't look like we're checking enough + * update_extattr doesn't actually check any permissions, + * it's called too late. + * + * If the 'name' belongs to our policy, we should make sure + * the new value is valid and permitted. + */ return (vnode_has_perm(cred, vp, NULL, FILE__SETATTR)); } @@ -3513,6 +3549,7 @@ .mpo_vnode_check_chdir = sebsd_vnode_check_chdir, .mpo_vnode_check_chroot = sebsd_vnode_check_chroot, .mpo_vnode_check_create = sebsd_vnode_check_create, + .mpo_vnode_check_deleteextattr = sebsd_vnode_check_deleteextattr, .mpo_vnode_check_exchangedata = sebsd_vnode_check_exchangedata, .mpo_vnode_check_exec = sebsd_vnode_check_exec, .mpo_vnode_check_getattrlist = sebsd_vnode_check_getattrlist, @@ -3520,6 +3557,7 @@ .mpo_vnode_check_ioctl = sebsd_vnode_check_ioctl, .mpo_vnode_check_label_update = sebsd_vnode_check_label_update, .mpo_vnode_check_link = sebsd_vnode_check_link, + .mpo_vnode_check_listextattr = sebsd_vnode_check_listextattr, .mpo_vnode_check_lookup = sebsd_vnode_check_lookup, .mpo_vnode_check_open = sebsd_vnode_check_open, .mpo_vnode_check_read = sebsd_vnode_check_read,