summaryrefslogtreecommitdiffstats
path: root/sys/fs/cd9660
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>2000-08-20 08:36:26 +0000
committerphk <phk@FreeBSD.org>2000-08-20 08:36:26 +0000
commit3d2aecdc81ed97cfbe436b52fc98b64db180e3ba (patch)
tree55c272da20b4e053d7634d0f42eb73a594cf619e /sys/fs/cd9660
parent936d03c5051b75e93717f207de0e6a3764c41cd7 (diff)
downloadFreeBSD-src-3d2aecdc81ed97cfbe436b52fc98b64db180e3ba.zip
FreeBSD-src-3d2aecdc81ed97cfbe436b52fc98b64db180e3ba.tar.gz
Centralize the canonical vop_access user/group/other check in vaccess().
Discussed with: bde
Diffstat (limited to 'sys/fs/cd9660')
-rw-r--r--sys/fs/cd9660/cd9660_vnops.c45
1 files changed, 3 insertions, 42 deletions
diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c
index e4c6909..b4e06fb 100644
--- a/sys/fs/cd9660/cd9660_vnops.c
+++ b/sys/fs/cd9660/cd9660_vnops.c
@@ -135,10 +135,7 @@ cd9660_access(ap)
{
struct vnode *vp = ap->a_vp;
struct iso_node *ip = VTOI(vp);
- struct ucred *cred = ap->a_cred;
- mode_t mask, mode = ap->a_mode;
- gid_t *gp;
- int i;
+ mode_t mode = ap->a_mode;
/*
* Disallow write attempts unless the file is a socket,
@@ -157,44 +154,8 @@ cd9660_access(ap)
}
}
- /* User id 0 always gets access. */
- if (cred->cr_uid == 0)
- return (0);
-
- mask = 0;
-
- /* Otherwise, check the owner. */
- if (cred->cr_uid == ip->inode.iso_uid) {
- if (mode & VEXEC)
- mask |= S_IXUSR;
- if (mode & VREAD)
- mask |= S_IRUSR;
- if (mode & VWRITE)
- mask |= S_IWUSR;
- return ((ip->inode.iso_mode & mask) == mask ? 0 : EACCES);
- }
-
- /* Otherwise, check the groups. */
- for (i = 0, gp = cred->cr_groups; i < cred->cr_ngroups; i++, gp++)
- if (ip->inode.iso_gid == *gp) {
- if (mode & VEXEC)
- mask |= S_IXGRP;
- if (mode & VREAD)
- mask |= S_IRGRP;
- if (mode & VWRITE)
- mask |= S_IWGRP;
- return ((ip->inode.iso_mode & mask) == mask ?
- 0 : EACCES);
- }
-
- /* Otherwise, check everyone else. */
- if (mode & VEXEC)
- mask |= S_IXOTH;
- if (mode & VREAD)
- mask |= S_IROTH;
- if (mode & VWRITE)
- mask |= S_IWOTH;
- return ((ip->inode.iso_mode & mask) == mask ? 0 : EACCES);
+ return (vaccess(vp->v_type, ip->inode.iso_mode, ip->inode.iso_uid,
+ ip->inode.iso_gid, ap->a_mode, ap->a_cred));
}
static int
OpenPOWER on IntegriCloud