[src/trunk]: src/sys/rump/librump/rumpvfs Add permissions support to rump_vop...

[njoly <njoly%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/53fda5e37546
branches:  trunk
changeset: 773281:53fda5e37546
user:      njoly <njoly%NetBSD.org@localhost>
date:      Mon Jan 30 16:17:14 2012 +0000

description:
Add permissions support to rump_vop_access(), to be used by
rump_vop_lookup().

diffstat:

 sys/rump/librump/rumpvfs/rumpfs.c |  70 ++++++++++++++++++++++++++++++--------
 1 files changed, 54 insertions(+), 16 deletions(-)

diffs (117 lines):

diff -r a17292d18646 -r 53fda5e37546 sys/rump/librump/rumpvfs/rumpfs.c
--- a/sys/rump/librump/rumpvfs/rumpfs.c Mon Jan 30 16:14:27 2012 +0000
+++ b/sys/rump/librump/rumpvfs/rumpfs.c Mon Jan 30 16:17:14 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rumpfs.c,v 1.104 2011/12/12 19:11:22 njoly Exp $       */
+/*     $NetBSD: rumpfs.c,v 1.105 2012/01/30 16:17:14 njoly Exp $       */
 
 /*
  * Copyright (c) 2009, 2010, 2011 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rumpfs.c,v 1.104 2011/12/12 19:11:22 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpfs.c,v 1.105 2012/01/30 16:17:14 njoly Exp $");
 
 #include <sys/param.h>
 #include <sys/atomic.h>
@@ -668,6 +668,10 @@
 
        *vpp = NULL;
 
+       rv = VOP_ACCESS(dvp, VEXEC, cnp->cn_cred);
+       if (rv)
+               return rv;
+
        if ((cnp->cn_flags & ISLASTCN)
            && (dvp->v_mount->mnt_flag & MNT_RDONLY)
            && (cnp->cn_nameiop == DELETE || cnp->cn_nameiop == RENAME))
@@ -766,9 +770,18 @@
        if (!rd && (cnp->cn_flags & ISLASTCN) && cnp->cn_nameiop == CREATE) {
                if (dvp->v_mount->mnt_flag & MNT_RDONLY)
                        return EROFS;
+               rv = VOP_ACCESS(dvp, VWRITE, cnp->cn_cred);
+               if (rv)
+                       return rv;
                return EJUSTRETURN;
        }
 
+       if ((cnp->cn_flags & ISLASTCN) && cnp->cn_nameiop == DELETE) {
+               rv = VOP_ACCESS(dvp, VWRITE, cnp->cn_cred);
+               if (rv)
+                       return rv;
+       }
+
        if (RDENT_ISWHITEOUT(rd)) {
                cnp->cn_flags |= ISWHITEOUT;
                if ((cnp->cn_flags & ISLASTCN) && cnp->cn_nameiop == CREATE)
@@ -801,6 +814,37 @@
        return rv;
 }
 
+static int
+rump_check_possible(struct vnode *vp, struct rumpfs_node *rnode,
+    mode_t mode)
+{
+
+       if ((mode & VWRITE) == 0)
+               return 0;
+
+       switch (vp->v_type) {
+       case VDIR:
+       case VLNK:
+       case VREG:
+               break;
+       default:
+               /* special file is always writable. */
+               return 0;
+       }
+
+       return vp->v_mount->mnt_flag & MNT_RDONLY ? EROFS : 0;
+}
+
+static int
+rump_check_permitted(struct vnode *vp, struct rumpfs_node *rnode,
+    mode_t mode, kauth_cred_t cred)
+{
+       struct vattr *attr = &rnode->rn_va;
+
+       return genfs_can_access(vp->v_type, attr->va_mode, attr->va_uid,
+           attr->va_gid, mode, cred);
+}
+
 int
 rump_vop_access(void *v)
 {
@@ -811,22 +855,16 @@
                kauth_cred_t a_cred;
        } */ *ap = v;
        struct vnode *vp = ap->a_vp;
-       int mode = ap->a_mode;
+       struct rumpfs_node *rn = vp->v_data;
+       int error;
 
-       if (mode & VWRITE) {
-               switch (vp->v_type) {
-               case VDIR:
-               case VLNK:
-               case VREG:
-                       if ((vp->v_mount->mnt_flag & MNT_RDONLY))
-                               return EROFS;
-                       break;
-               default:
-                       break;
-               }
-       }
+       error = rump_check_possible(vp, rn, ap->a_mode);
+       if (error)
+               return error;
 
-       return 0;
+       error = rump_check_permitted(vp, rn, ap->a_mode, ap->a_cred);
+
+       return error;
 }
 
 static int