From owner-trustedbsd-cvs@FreeBSD.ORG Wed Mar 8 21:43:28 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 D349B16A420 for ; Wed, 8 Mar 2006 21:43:28 +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 DA5A643D55 for ; Wed, 8 Mar 2006 21:43:25 +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 054DF46C4F for ; Wed, 8 Mar 2006 16:43:04 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id CDDAC5571C; Wed, 8 Mar 2006 21:43:24 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id BD72816A423; Wed, 8 Mar 2006 21:43:24 +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 7C54E16A422 for ; Wed, 8 Mar 2006 21:43:24 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8B32243D5A for ; Wed, 8 Mar 2006 21:43:23 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k28LhNxV046706 for ; Wed, 8 Mar 2006 21:43:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k28LhNa6046703 for perforce@freebsd.org; Wed, 8 Mar 2006 21:43:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 8 Mar 2006 21:43:23 GMT Message-Id: <200603082143.k28LhNa6046703@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 92989 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:43:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=92989 Change 92989 by rwatson@rwatson_peppercorn on 2006/03/08 21:43:17 Setting file flags via fcntl() doesn't allow changing the access mode flags tested by this #if 0'd block, since they are immediately cleared. As such, as don't actually need to check for permission here. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_descrip.c#62 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_descrip.c#62 (text+ko) ==== @@ -39,7 +39,6 @@ #include "opt_compat.h" #include "opt_ddb.h" -#include "opt_mac.h" #include #include @@ -53,7 +52,6 @@ #include #include #include -#include #include #include #include @@ -434,36 +432,6 @@ mtx_assert(&Giant, MA_OWNED); FILE_LOCK(fp); fhold_locked(fp); -#if 0 -#ifdef MAC - if (fp->f_type == DTYPE_VNODE) { - int fflag = (fp->f_flag & ~FCNTLFLAGS) | - (FFLAGS(uap->arg & ~O_ACCMODE) & FCNTLFLAGS); - mode_t mode = 0; - - if (fflag & FREAD) - mode |= VREAD; - if (fflag & FWRITE) - mode |= VWRITE; - if (fflag & O_APPEND) - mode |= VAPPEND; - vn_lock((struct vnode *)fp->f_data, LK_EXCLUSIVE | - LK_RETRY, td); - /* - * XXX: A seperate entry point should be used here - * to pass in both the old and the new flags, - * with authorization performed only on the delta. - */ - error = mac_check_vnode_open(td->td_ucred, - (struct vnode *)fp->f_data, mode); - VOP_UNLOCK((struct vnode *)fp->f_data, 0, td); - if (error) { - fdrop(fp, td); - break; - } - } -#endif /* MAC */ -#endif fp->f_flag &= ~FCNTLFLAGS; fp->f_flag |= FFLAGS(arg & ~O_ACCMODE) & FCNTLFLAGS; FILE_UNLOCK(fp);