diff options
| author |   helg <helg@openbsd.org> | 2018-06-18 11:24:15 +0000 |
|---|---|---|
| committer | helg <helg@openbsd.org> | 2018-06-18 11:24:15 +0000 |
| commit | 93697741f902912bfdcf69897676a0f48d7f8e1a (patch) | |
| tree | 4f1095514455905fab11e0492561c24407804114 | |
| parent | Refactor the six ways to find TCP options into one new function. As a result: (diff) | |
| download | wireguard-openbsd-93697741f902912bfdcf69897676a0f48d7f8e1a.tar.xz wireguard-openbsd-93697741f902912bfdcf69897676a0f48d7f8e1a.zip | |
chmod(2) should return EFTYPE if the effective user ID is not the
super-user, the mode includes the sticky bit (S_ISVTX), and path
does not refer to a directory.
ok mpi@
| -rw-r--r-- | sys/miscfs/fuse/fuse_vnops.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/sys/miscfs/fuse/fuse_vnops.c b/sys/miscfs/fuse/fuse_vnops.c index 613d444fb37..8f2e8d7e4c5 100644 --- a/sys/miscfs/fuse/fuse_vnops.c +++ b/sys/miscfs/fuse/fuse_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fuse_vnops.c,v 1.44 2018/06/07 13:37:28 visa Exp $ */ +/* $OpenBSD: fuse_vnops.c,v 1.45 2018/06/18 11:24:15 helg Exp $ */ /* * Copyright (c) 2012-2013 Sylvestre Gallon <ccna.syl@gmail.com> * @@ -440,6 +440,7 @@ fusefs_setattr(void *v) struct vattr *vap = ap->a_vap; struct vnode *vp = ap->a_vp; struct fusefs_node *ip = VTOI(vp); + struct ucred *cred = ap->a_cred; struct proc *p = ap->a_p; struct fusefs_mnt *fmp; struct fusebuf *fbuf; @@ -485,6 +486,11 @@ fusefs_setattr(void *v) } if (vap->va_size != VNOVAL) { + /* + * Disallow write attempts on read-only file systems; + * unless the file is a socket, fifo, or a block or + * character device resident on the file system. + */ switch (vp->v_type) { case VDIR: error = EISDIR; @@ -528,6 +534,18 @@ fusefs_setattr(void *v) error = EROFS; goto out; } + + /* + * chmod returns EFTYPE if the effective user ID is not the + * super-user, the mode includes the sticky bit (S_ISVTX), and + * path does not refer to a directory + */ + if (cred->cr_uid != 0 && vp->v_type != VDIR && + (vap->va_mode & S_ISTXT)) { + error = EFTYPE; + goto out; + } + fbuf->fb_attr.st_mode = vap->va_mode & ALLPERMS; io->fi_flags |= FUSE_FATTR_MODE; } |