From owner-svn-src-head@FreeBSD.ORG Sat Dec 26 11:36:10 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8A5DB106568F; Sat, 26 Dec 2009 11:36:10 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 607088FC14; Sat, 26 Dec 2009 11:36:10 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nBQBaA0c009036; Sat, 26 Dec 2009 11:36:10 GMT (envelope-from trasz@svn.freebsd.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBQBaAh3009032; Sat, 26 Dec 2009 11:36:10 GMT (envelope-from trasz@svn.freebsd.org) Message-Id: <200912261136.nBQBaAh3009032@svn.freebsd.org> From: Edward Tomasz Napierala Date: Sat, 26 Dec 2009 11:36:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r201019 - head/sys/kern X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Dec 2009 11:36:10 -0000 Author: trasz Date: Sat Dec 26 11:36:10 2009 New Revision: 201019 URL: http://svn.freebsd.org/changeset/base/201019 Log: Now that all the callers seem to be fixed, add KASSERTs to make sure VAPPEND is not being used improperly. Modified: head/sys/kern/subr_acl_nfs4.c head/sys/kern/subr_acl_posix1e.c head/sys/kern/vfs_subr.c Modified: head/sys/kern/subr_acl_nfs4.c ============================================================================== --- head/sys/kern/subr_acl_nfs4.c Sat Dec 26 11:03:10 2009 (r201018) +++ head/sys/kern/subr_acl_nfs4.c Sat Dec 26 11:36:10 2009 (r201019) @@ -163,6 +163,14 @@ vaccess_acl_nfs4(enum vtype type, uid_t int denied, explicitly_denied, access_mask, is_directory, must_be_owner = 0; + KASSERT((accmode & ~(VEXEC | VWRITE | VREAD | VADMIN | VAPPEND | + VEXPLICIT_DENY | VREAD_NAMED_ATTRS | VWRITE_NAMED_ATTRS | + VDELETE_CHILD | VREAD_ATTRIBUTES | VWRITE_ATTRIBUTES | VDELETE | + VREAD_ACL | VWRITE_ACL | VWRITE_OWNER | VSYNCHRONIZE)) == 0, + ("invalid bit in accmode")); + KASSERT((accmode & VAPPEND) == 0 || (accmode & VWRITE), + ("VAPPEND without VWRITE")); + if (privused != NULL) *privused = 0; Modified: head/sys/kern/subr_acl_posix1e.c ============================================================================== --- head/sys/kern/subr_acl_posix1e.c Sat Dec 26 11:03:10 2009 (r201018) +++ head/sys/kern/subr_acl_posix1e.c Sat Dec 26 11:36:10 2009 (r201019) @@ -63,6 +63,8 @@ vaccess_acl_posix1e(enum vtype type, uid KASSERT((accmode & ~(VEXEC | VWRITE | VREAD | VADMIN | VAPPEND)) == 0, ("invalid bit in accmode")); + KASSERT((accmode & VAPPEND) == 0 || (accmode & VWRITE), + ("VAPPEND without VWRITE")); /* * Look for a normal, non-privileged way to access the file/directory Modified: head/sys/kern/vfs_subr.c ============================================================================== --- head/sys/kern/vfs_subr.c Sat Dec 26 11:03:10 2009 (r201018) +++ head/sys/kern/vfs_subr.c Sat Dec 26 11:36:10 2009 (r201019) @@ -3534,6 +3534,8 @@ vaccess(enum vtype type, mode_t file_mod KASSERT((accmode & ~(VEXEC | VWRITE | VREAD | VADMIN | VAPPEND)) == 0, ("invalid bit in accmode")); + KASSERT((accmode & VAPPEND) == 0 || (accmode & VWRITE), + ("VAPPEND without VWRITE")); /* * Look for a normal, non-privileged way to access the file/directory