Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys C99 section 6.7.2.3 (Tags) Note 3 states that:



details:   https://anonhg.NetBSD.org/src/rev/2cabc9fbde14
branches:  trunk
changeset: 785538:2cabc9fbde14
user:      plunky <plunky%NetBSD.org@localhost>
date:      Mon Mar 18 19:35:35 2013 +0000

description:
C99 section 6.7.2.3 (Tags) Note 3 states that:

  A type specifier of the form

        enum identifier

  without an enumerator list shall only appear after the type it
  specifies is complete.

which means that we cannot pass an "enum vtype" argument to
kauth_access_action() without fully specifying the type first.
Unfortunately there is a complicated include file loop which
makes that difficult, so convert this minimal function into a
macro (and capitalize it).

(ok elad@)

diffstat:

 sys/fs/adosfs/advnops.c            |   6 +++---
 sys/fs/cd9660/cd9660_vnops.c       |   6 +++---
 sys/fs/efs/efs_vnops.c             |   6 +++---
 sys/fs/filecorefs/filecore_vnops.c |   6 +++---
 sys/fs/hfs/hfs_vnops.c             |   6 +++---
 sys/fs/msdosfs/msdosfs_vnops.c     |   6 +++---
 sys/fs/nilfs/nilfs_vnops.c         |   6 +++---
 sys/fs/ntfs/ntfs_vnops.c           |   6 +++---
 sys/fs/ptyfs/ptyfs_vnops.c         |   6 +++---
 sys/fs/smbfs/smbfs_vnops.c         |   6 +++---
 sys/fs/sysvbfs/sysvbfs_vnops.c     |   6 +++---
 sys/fs/tmpfs/tmpfs_vnops.c         |   6 +++---
 sys/fs/udf/udf_vnops.c             |   6 +++---
 sys/fs/v7fs/v7fs_vnops.c           |   6 +++---
 sys/kern/kern_auth.c               |  15 ++-------------
 sys/kern/vfs_subr.c                |   6 +++---
 sys/miscfs/kernfs/kernfs_vnops.c   |   6 +++---
 sys/miscfs/procfs/procfs_vnops.c   |   6 +++---
 sys/nfs/nfs_vnops.c                |   6 +++---
 sys/sys/kauth.h                    |   8 +++++---
 sys/ufs/chfs/chfs_vnops.c          |   4 ++--
 sys/ufs/ext2fs/ext2fs_vnops.c      |   6 +++---
 sys/ufs/ufs/ufs_vnops.c            |   6 +++---
 23 files changed, 69 insertions(+), 78 deletions(-)

diffs (truncated from 625 to 300 lines):

diff -r 588bc1246d98 -r 2cabc9fbde14 sys/fs/adosfs/advnops.c
--- a/sys/fs/adosfs/advnops.c   Mon Mar 18 19:31:39 2013 +0000
+++ b/sys/fs/adosfs/advnops.c   Mon Mar 18 19:35:35 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: advnops.c,v 1.40 2012/12/20 08:03:42 hannken Exp $     */
+/*     $NetBSD: advnops.c,v 1.41 2013/03/18 19:35:35 plunky Exp $      */
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: advnops.c,v 1.40 2012/12/20 08:03:42 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: advnops.c,v 1.41 2013/03/18 19:35:35 plunky Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -776,7 +776,7 @@
 {
        mode_t file_mode = adunixprot(ap->adprot) & ap->amp->mask;
 
-       return kauth_authorize_vnode(cred, kauth_access_action(mode,
+       return kauth_authorize_vnode(cred, KAUTH_ACCESS_ACTION(mode,
            vp->v_type, file_mode), vp, NULL, genfs_can_access(vp->v_type,
            file_mode, ap->uid, ap->gid, mode, cred));
 }
diff -r 588bc1246d98 -r 2cabc9fbde14 sys/fs/cd9660/cd9660_vnops.c
--- a/sys/fs/cd9660/cd9660_vnops.c      Mon Mar 18 19:31:39 2013 +0000
+++ b/sys/fs/cd9660/cd9660_vnops.c      Mon Mar 18 19:35:35 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cd9660_vnops.c,v 1.42 2012/12/20 08:03:42 hannken Exp $        */
+/*     $NetBSD: cd9660_vnops.c,v 1.43 2013/03/18 19:35:35 plunky Exp $ */
 
 /*-
  * Copyright (c) 1994
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd9660_vnops.c,v 1.42 2012/12/20 08:03:42 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd9660_vnops.c,v 1.43 2013/03/18 19:35:35 plunky Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -117,7 +117,7 @@
     kauth_cred_t cred)
 {
 
-       return kauth_authorize_vnode(cred, kauth_access_action(mode,
+       return kauth_authorize_vnode(cred, KAUTH_ACCESS_ACTION(mode,
            vp->v_type, ip->inode.iso_mode & ALLPERMS), vp, NULL,
            genfs_can_access(vp->v_type, ip->inode.iso_mode & ALLPERMS,
            ip->inode.iso_uid, ip->inode.iso_gid, mode, cred));
diff -r 588bc1246d98 -r 2cabc9fbde14 sys/fs/efs/efs_vnops.c
--- a/sys/fs/efs/efs_vnops.c    Mon Mar 18 19:31:39 2013 +0000
+++ b/sys/fs/efs/efs_vnops.c    Mon Mar 18 19:35:35 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: efs_vnops.c,v 1.29 2012/12/20 08:03:42 hannken Exp $   */
+/*     $NetBSD: efs_vnops.c,v 1.30 2013/03/18 19:35:36 plunky Exp $    */
 
 /*
  * Copyright (c) 2006 Stephen M. Rumble <rumble%ephemeral.org@localhost>
@@ -17,7 +17,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: efs_vnops.c,v 1.29 2012/12/20 08:03:42 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: efs_vnops.c,v 1.30 2013/03/18 19:35:36 plunky Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -149,7 +149,7 @@
     kauth_cred_t cred)
 {
 
-       return kauth_authorize_vnode(cred, kauth_access_action(mode,
+       return kauth_authorize_vnode(cred, KAUTH_ACCESS_ACTION(mode,
            vp->v_type, eip->ei_mode), vp, NULL, genfs_can_access(vp->v_type,
            eip->ei_mode, eip->ei_uid, eip->ei_gid, mode, cred));
 }
diff -r 588bc1246d98 -r 2cabc9fbde14 sys/fs/filecorefs/filecore_vnops.c
--- a/sys/fs/filecorefs/filecore_vnops.c        Mon Mar 18 19:31:39 2013 +0000
+++ b/sys/fs/filecorefs/filecore_vnops.c        Mon Mar 18 19:35:35 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: filecore_vnops.c,v 1.35 2012/12/20 08:03:42 hannken Exp $      */
+/*     $NetBSD: filecore_vnops.c,v 1.36 2013/03/18 19:35:36 plunky Exp $       */
 
 /*-
  * Copyright (c) 1994 The Regents of the University of California.
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: filecore_vnops.c,v 1.35 2012/12/20 08:03:42 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: filecore_vnops.c,v 1.36 2013/03/18 19:35:36 plunky Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -126,7 +126,7 @@
 {
        struct filecore_mnt *fcmp = ip->i_mnt;
 
-       return kauth_authorize_vnode(cred, kauth_access_action(mode,
+       return kauth_authorize_vnode(cred, KAUTH_ACCESS_ACTION(mode,
            vp->v_type, filecore_mode(ip)), vp, NULL,
            genfs_can_access(vp->v_type, filecore_mode(ip), fcmp->fc_uid,
            fcmp->fc_gid, mode, cred));
diff -r 588bc1246d98 -r 2cabc9fbde14 sys/fs/hfs/hfs_vnops.c
--- a/sys/fs/hfs/hfs_vnops.c    Mon Mar 18 19:31:39 2013 +0000
+++ b/sys/fs/hfs/hfs_vnops.c    Mon Mar 18 19:35:35 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hfs_vnops.c,v 1.26 2012/07/22 00:53:19 rmind Exp $     */
+/*     $NetBSD: hfs_vnops.c,v 1.27 2013/03/18 19:35:37 plunky Exp $    */
 
 /*-
  * Copyright (c) 2005, 2007 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hfs_vnops.c,v 1.26 2012/07/22 00:53:19 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hfs_vnops.c,v 1.27 2013/03/18 19:35:37 plunky Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ipsec.h"
@@ -556,7 +556,7 @@
     kauth_cred_t cred)
 {
 
-       return kauth_authorize_vnode(cred, kauth_access_action(mode,
+       return kauth_authorize_vnode(cred, KAUTH_ACCESS_ACTION(mode,
            va->va_type, va->va_mode), vp, NULL,  genfs_can_access(va->va_type,
            va->va_mode, va->va_uid, va->va_gid, mode, cred));
 }
diff -r 588bc1246d98 -r 2cabc9fbde14 sys/fs/msdosfs/msdosfs_vnops.c
--- a/sys/fs/msdosfs/msdosfs_vnops.c    Mon Mar 18 19:31:39 2013 +0000
+++ b/sys/fs/msdosfs/msdosfs_vnops.c    Mon Mar 18 19:35:35 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: msdosfs_vnops.c,v 1.85 2012/12/28 08:03:59 hannken Exp $       */
+/*     $NetBSD: msdosfs_vnops.c,v 1.86 2013/03/18 19:35:37 plunky Exp $        */
 
 /*-
  * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msdosfs_vnops.c,v 1.85 2012/12/28 08:03:59 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msdosfs_vnops.c,v 1.86 2013/03/18 19:35:37 plunky Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -223,7 +223,7 @@
 
        file_mode &= (vp->v_type == VDIR ? pmp->pm_dirmask : pmp->pm_mask);
 
-       return kauth_authorize_vnode(cred, kauth_access_action(mode,
+       return kauth_authorize_vnode(cred, KAUTH_ACCESS_ACTION(mode,
            vp->v_type, file_mode), vp, NULL, genfs_can_access(vp->v_type,
            file_mode, pmp->pm_uid, pmp->pm_gid, mode, cred));
 }
diff -r 588bc1246d98 -r 2cabc9fbde14 sys/fs/nilfs/nilfs_vnops.c
--- a/sys/fs/nilfs/nilfs_vnops.c        Mon Mar 18 19:31:39 2013 +0000
+++ b/sys/fs/nilfs/nilfs_vnops.c        Mon Mar 18 19:35:35 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: nilfs_vnops.c,v 1.20 2012/11/05 17:27:37 dholland Exp $ */
+/* $NetBSD: nilfs_vnops.c,v 1.21 2013/03/18 19:35:38 plunky Exp $ */
 
 /*
  * Copyright (c) 2008, 2009 Reinoud Zandijk
@@ -28,7 +28,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: nilfs_vnops.c,v 1.20 2012/11/05 17:27:37 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nilfs_vnops.c,v 1.21 2013/03/18 19:35:38 plunky Exp $");
 #endif /* not lint */
 
 
@@ -1038,7 +1038,7 @@
 {
 
        /* ask the generic genfs_can_access to advice on security */
-       return kauth_authorize_vnode(cred, kauth_access_action(mode,
+       return kauth_authorize_vnode(cred, KAUTH_ACCESS_ACTION(mode,
            vp->v_type, vap->va_mode), vp, NULL, genfs_can_access(vp->v_type,
            vap->va_mode, vap->va_uid, vap->va_gid, mode, cred));
 }
diff -r 588bc1246d98 -r 2cabc9fbde14 sys/fs/ntfs/ntfs_vnops.c
--- a/sys/fs/ntfs/ntfs_vnops.c  Mon Mar 18 19:31:39 2013 +0000
+++ b/sys/fs/ntfs/ntfs_vnops.c  Mon Mar 18 19:35:35 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ntfs_vnops.c,v 1.54 2012/11/05 17:27:38 dholland Exp $ */
+/*     $NetBSD: ntfs_vnops.c,v 1.55 2013/03/18 19:35:38 plunky Exp $   */
 
 /*
  * Copyright (c) 1992, 1993
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ntfs_vnops.c,v 1.54 2012/11/05 17:27:38 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ntfs_vnops.c,v 1.55 2013/03/18 19:35:38 plunky Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -424,7 +424,7 @@
 
        file_mode = ip->i_mp->ntm_mode | (S_IXUSR|S_IXGRP|S_IXOTH);
 
-       return kauth_authorize_vnode(cred, kauth_access_action(mode, vp->v_type,
+       return kauth_authorize_vnode(cred, KAUTH_ACCESS_ACTION(mode, vp->v_type,
            file_mode), vp, NULL, genfs_can_access(vp->v_type, file_mode,
            ip->i_mp->ntm_uid, ip->i_mp->ntm_gid, mode, cred));
 }
diff -r 588bc1246d98 -r 2cabc9fbde14 sys/fs/ptyfs/ptyfs_vnops.c
--- a/sys/fs/ptyfs/ptyfs_vnops.c        Mon Mar 18 19:31:39 2013 +0000
+++ b/sys/fs/ptyfs/ptyfs_vnops.c        Mon Mar 18 19:35:35 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ptyfs_vnops.c,v 1.40 2012/10/24 23:36:15 christos Exp $        */
+/*     $NetBSD: ptyfs_vnops.c,v 1.41 2013/03/18 19:35:38 plunky Exp $  */
 
 /*
  * Copyright (c) 1993, 1995
@@ -76,7 +76,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ptyfs_vnops.c,v 1.40 2012/10/24 23:36:15 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ptyfs_vnops.c,v 1.41 2013/03/18 19:35:38 plunky Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -536,7 +536,7 @@
                return error;
 
        return kauth_authorize_vnode(ap->a_cred,
-           kauth_access_action(ap->a_mode, ap->a_vp->v_type, va.va_mode),
+           KAUTH_ACCESS_ACTION(ap->a_mode, ap->a_vp->v_type, va.va_mode),
            ap->a_vp, NULL, genfs_can_access(va.va_type, va.va_mode, va.va_uid,
            va.va_gid, ap->a_mode, ap->a_cred));
 
diff -r 588bc1246d98 -r 2cabc9fbde14 sys/fs/smbfs/smbfs_vnops.c
--- a/sys/fs/smbfs/smbfs_vnops.c        Mon Mar 18 19:31:39 2013 +0000
+++ b/sys/fs/smbfs/smbfs_vnops.c        Mon Mar 18 19:35:35 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: smbfs_vnops.c,v 1.85 2012/11/30 23:24:21 nakayama Exp $        */
+/*     $NetBSD: smbfs_vnops.c,v 1.86 2013/03/18 19:35:39 plunky Exp $  */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smbfs_vnops.c,v 1.85 2012/11/30 23:24:21 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smbfs_vnops.c,v 1.86 2013/03/18 19:35:39 plunky Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -193,7 +193,7 @@
        mode_t file_mode = (vp->v_type == VDIR) ? smp->sm_args.dir_mode :
            smp->sm_args.file_mode;
 
-       return kauth_authorize_vnode(cred, kauth_access_action(mode,
+       return kauth_authorize_vnode(cred, KAUTH_ACCESS_ACTION(mode,
            vp->v_type, file_mode), vp, NULL, genfs_can_access(vp->v_type,
            file_mode, smp->sm_args.uid, smp->sm_args.gid, mode, cred));
 }
diff -r 588bc1246d98 -r 2cabc9fbde14 sys/fs/sysvbfs/sysvbfs_vnops.c
--- a/sys/fs/sysvbfs/sysvbfs_vnops.c    Mon Mar 18 19:31:39 2013 +0000
+++ b/sys/fs/sysvbfs/sysvbfs_vnops.c    Mon Mar 18 19:35:35 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sysvbfs_vnops.c,v 1.46 2012/06/11 21:11:41 agc Exp $   */
+/*     $NetBSD: sysvbfs_vnops.c,v 1.47 2013/03/18 19:35:40 plunky Exp $        */
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysvbfs_vnops.c,v 1.46 2012/06/11 21:11:41 agc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysvbfs_vnops.c,v 1.47 2013/03/18 19:35:40 plunky Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -251,7 +251,7 @@
 {
        struct bfs_fileattr *attr = &bnode->inode->attr;
 
-       return kauth_authorize_vnode(cred, kauth_access_action(mode,
+       return kauth_authorize_vnode(cred, KAUTH_ACCESS_ACTION(mode,
            vp->v_type, attr->mode), vp, NULL, genfs_can_access(vp->v_type,
            attr->mode, attr->uid, attr->gid, mode, cred));
 }
diff -r 588bc1246d98 -r 2cabc9fbde14 sys/fs/tmpfs/tmpfs_vnops.c
--- a/sys/fs/tmpfs/tmpfs_vnops.c        Mon Mar 18 19:31:39 2013 +0000
+++ b/sys/fs/tmpfs/tmpfs_vnops.c        Mon Mar 18 19:35:35 2013 +0000



Home | Main Index | Thread Index | Old Index