From owner-trustedbsd-cvs@FreeBSD.ORG Wed Mar 8 21:12:58 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B969916A420 for ; Wed, 8 Mar 2006 21:12:58 +0000 (GMT) (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 1DD8B43D70 for ; Wed, 8 Mar 2006 21:12:48 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 4827746BA4 for ; Wed, 8 Mar 2006 16:12:26 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id CB2FE5737C; Wed, 8 Mar 2006 21:12:46 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id BA7F916A423; Wed, 8 Mar 2006 21:12:46 +0000 (GMT) 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 8F2B416A420 for ; Wed, 8 Mar 2006 21:12:46 +0000 (GMT) (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 577BC43D72 for ; Wed, 8 Mar 2006 21:12:39 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k28LCd0K041020 for ; Wed, 8 Mar 2006 21:12:39 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k28LCdXs041017 for perforce@freebsd.org; Wed, 8 Mar 2006 21:12:39 GMT (envelope-from millert@freebsd.org) Date: Wed, 8 Mar 2006 21:12:39 GMT Message-Id: <200603082112.k28LCdXs041017@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 92985 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: Wed, 08 Mar 2006 21:12:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=92985 Change 92985 by millert@millert_g5tower on 2006/03/08 21:11:39 Back out last revision. Old behavior was consistent with SELinux. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#36 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#36 (text+ko) ==== @@ -306,10 +306,6 @@ { access_vector_t av = 0; - /* per access(2), mask == 0 means only check for existence */ - if (mask == 0) - return FILE__ACCESS; - if (vt != VDIR) { if (mask & VEXEC) av |= FILE__EXECUTE; @@ -1243,8 +1239,6 @@ &osec->sid); } -extern int selinux_enforcing; - static int sebsd_check_ipc_method(struct label *subj, struct label *obj, int msgid) { @@ -1708,7 +1702,10 @@ struct label *filelabel, int acc_mode) { - /* NOTE: acc_mode == 0 is legal for access(2) */ + /* existence check (F_OK) */ + if (acc_mode == 0) + return 0; + return (vnode_has_perm(cred, vp, file_mask_to_av(vp->v_type, acc_mode), NULL)); }