fusefrontend: Use Fchmodat to implement Chmod
This commit is contained in:
parent
0f44c617d0
commit
0162392a28
|
@ -239,13 +239,14 @@ func (fs *FS) Chmod(path string, mode uint32, context *fuse.Context) (code fuse.
|
||||||
if fs.isFiltered(path) {
|
if fs.isFiltered(path) {
|
||||||
return fuse.EPERM
|
return fuse.EPERM
|
||||||
}
|
}
|
||||||
cPath, err := fs.getBackingPath(path)
|
dirfd, cName, err := fs.openBackingPath(path)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fuse.ToStatus(err)
|
return fuse.ToStatus(err)
|
||||||
}
|
}
|
||||||
|
defer dirfd.Close()
|
||||||
// os.Chmod goes through the "syscallMode" translation function that messes
|
// os.Chmod goes through the "syscallMode" translation function that messes
|
||||||
// up the suid and sgid bits. So use syscall.Chmod directly.
|
// up the suid and sgid bits. So use a syscall directly.
|
||||||
err = syscall.Chmod(cPath, mode)
|
err = syscallcompat.Fchmodat(int(dirfd.Fd()), cName, mode, unix.AT_SYMLINK_NOFOLLOW)
|
||||||
return fuse.ToStatus(err)
|
return fuse.ToStatus(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -137,6 +137,23 @@ func Dup3(oldfd int, newfd int, flags int) (err error) {
|
||||||
return syscall.Dup2(oldfd, newfd)
|
return syscall.Dup2(oldfd, newfd)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Poor man's Fchmodat.
|
||||||
|
func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
|
||||||
|
chdirMutex.Lock()
|
||||||
|
defer chdirMutex.Unlock()
|
||||||
|
cwd, err := syscall.Open(".", syscall.O_RDONLY, 0)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer syscall.Close(cwd)
|
||||||
|
err = syscall.Fchdir(dirfd)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer syscall.Fchdir(cwd)
|
||||||
|
return syscall.Chmod(path, mode)
|
||||||
|
}
|
||||||
|
|
||||||
// Poor man's Fchownat.
|
// Poor man's Fchownat.
|
||||||
func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
|
func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
|
||||||
chdirMutex.Lock()
|
chdirMutex.Lock()
|
||||||
|
|
|
@ -80,6 +80,11 @@ func Dup3(oldfd int, newfd int, flags int) (err error) {
|
||||||
return syscall.Dup3(oldfd, newfd, flags)
|
return syscall.Dup3(oldfd, newfd, flags)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Fchmodat syscall.
|
||||||
|
func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
|
||||||
|
return syscall.Fchmodat(dirfd, path, mode, flags)
|
||||||
|
}
|
||||||
|
|
||||||
// Fchownat syscall.
|
// Fchownat syscall.
|
||||||
func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
|
func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
|
||||||
return syscall.Fchownat(dirfd, path, uid, gid, flags)
|
return syscall.Fchownat(dirfd, path, uid, gid, flags)
|
||||||
|
|
Loading…
Reference in New Issue