diff options
| author | Jakob Unterwurzacher | 2019-01-14 21:54:16 +0100 |
|---|---|---|
| committer | Jakob Unterwurzacher | 2019-01-14 21:54:16 +0100 |
| commit | a7d59032d3790e117a48be6be1fb3a968266093b (patch) | |
| tree | 5c0b642f701106e1f27db5fea69c45bdc5e3dac0 /internal/fusefrontend | |
| parent | a9d8eb49ef91c31fddc3e4f2f76e9b98e1a52a1d (diff) | |
syscallcompat: rework Fchmodat to FchmodatNofollow
We never want Fchmodat to follow symlinks, so follow what
Qemu does, and call our function FchmodatNofollow.
Diffstat (limited to 'internal/fusefrontend')
| -rw-r--r-- | internal/fusefrontend/fs.go | 2 | ||||
| -rw-r--r-- | internal/fusefrontend/fs_dir.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/internal/fusefrontend/fs.go b/internal/fusefrontend/fs.go index e8f3033..7492778 100644 --- a/internal/fusefrontend/fs.go +++ b/internal/fusefrontend/fs.go @@ -290,7 +290,7 @@ func (fs *FS) Chmod(path string, mode uint32, context *fuse.Context) (code fuse. defer syscall.Close(dirfd) // os.Chmod goes through the "syscallMode" translation function that messes // up the suid and sgid bits. So use a syscall directly. - err = syscallcompat.Fchmodat(dirfd, cName, mode, unix.AT_SYMLINK_NOFOLLOW) + err = syscallcompat.FchmodatNofollow(dirfd, cName, mode) return fuse.ToStatus(err) } diff --git a/internal/fusefrontend/fs_dir.go b/internal/fusefrontend/fs_dir.go index a017050..d26fd79 100644 --- a/internal/fusefrontend/fs_dir.go +++ b/internal/fusefrontend/fs_dir.go @@ -164,7 +164,7 @@ func (fs *FS) Rmdir(relPath string, context *fuse.Context) (code fuse.Status) { } // This cast is needed on Darwin, where st.Mode is uint16. origMode := uint32(st.Mode) - err = syscallcompat.Fchmodat(parentDirFd, cName, origMode|0700, unix.AT_SYMLINK_NOFOLLOW) + err = syscallcompat.FchmodatNofollow(parentDirFd, cName, origMode|0700) if err != nil { tlog.Debug.Printf("Rmdir: Fchmodat failed: %v", err) return fuse.ToStatus(err) @@ -175,7 +175,7 @@ func (fs *FS) Rmdir(relPath string, context *fuse.Context) (code fuse.Status) { // Undo the chmod if removing the directory failed defer func() { if code != fuse.OK { - err = syscallcompat.Fchmodat(parentDirFd, cName, origMode, unix.AT_SYMLINK_NOFOLLOW) + err = syscallcompat.FchmodatNofollow(parentDirFd, cName, origMode) if err != nil { tlog.Warn.Printf("Rmdir: Chmod rollback failed: %v", err) } |