diff options
| author | Sebastian Lackner | 2019-01-12 21:22:52 +0100 | 
|---|---|---|
| committer | Sebastian Lackner | 2019-01-12 21:22:58 +0100 | 
| commit | efc280330c68dc5cbf605921f6c840a54d5841bb (patch) | |
| tree | d531534d3681342ad8a929765ce433d2eb6096f7 /internal/syscallcompat | |
| parent | 1fbe7798cf879d80cfbd755b05bdadae24bc5519 (diff) | |
fusefrontend: -allow_other: Use SymlinkatUser in Symlink FUSE call.
Instead of manually adjusting the user after creating the symlink,
adjust effective permissions and let the kernel deal with it.
Related to https://github.com/rfjakob/gocryptfs/issues/338.
Diffstat (limited to 'internal/syscallcompat')
| -rw-r--r-- | internal/syscallcompat/sys_darwin.go | 5 | ||||
| -rw-r--r-- | internal/syscallcompat/sys_linux.go | 22 | 
2 files changed, 27 insertions, 0 deletions
| diff --git a/internal/syscallcompat/sys_darwin.go b/internal/syscallcompat/sys_darwin.go index c9f3ad7..52803ab 100644 --- a/internal/syscallcompat/sys_darwin.go +++ b/internal/syscallcompat/sys_darwin.go @@ -80,6 +80,11 @@ func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {  	return emulateSymlinkat(oldpath, newdirfd, newpath)  } +func SymlinkatUser(oldpath string, newdirfd int, newpath string, context *fuse.Context) (err error) { +	// FIXME: take into account context.Owner +	return Symlinkat(oldpath, newdirfd, newpath) +} +  func Mkdirat(dirfd int, path string, mode uint32) (err error) {  	return emulateMkdirat(dirfd, path, mode)  } diff --git a/internal/syscallcompat/sys_linux.go b/internal/syscallcompat/sys_linux.go index cf747b1..6f2a70d 100644 --- a/internal/syscallcompat/sys_linux.go +++ b/internal/syscallcompat/sys_linux.go @@ -197,6 +197,28 @@ func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {  	return unix.Symlinkat(oldpath, newdirfd, newpath)  } +// SymlinkatUser runs the Symlinkat syscall in the context of a different user. +func SymlinkatUser(oldpath string, newdirfd int, newpath string, context *fuse.Context) (err error) { +	if context != nil { +		runtime.LockOSThread() +		defer runtime.UnlockOSThread() + +		err = syscall.Setregid(-1, int(context.Owner.Gid)) +		if err != nil { +			return err +		} +		defer syscall.Setregid(-1, 0) + +		err = syscall.Setreuid(-1, int(context.Owner.Uid)) +		if err != nil { +			return err +		} +		defer syscall.Setreuid(-1, 0) +	} + +	return Symlinkat(oldpath, newdirfd, newpath) +} +  // Mkdirat syscall.  func Mkdirat(dirfd int, path string, mode uint32) (err error) {  	return syscall.Mkdirat(dirfd, path, mode) | 
