diff options
| author | Sebastian Lackner | 2017-11-29 13:21:28 +0100 |
|---|---|---|
| committer | Sebastian Lackner | 2017-11-29 13:28:04 +0100 |
| commit | 614745ee576760023961fbf815985b90f90ad1d7 (patch) | |
| tree | d2577781a64df82303ed569c95cfb9a658fae5f6 /internal/nametransform/diriv.go | |
| parent | 67bcbe81e80da29fb340c5a4712831f70442d8c9 (diff) | |
fusefrontend: allow_other: close race between mkdir and chown
Fixes the same problem as described in 72b975867a3b9bdf53fc2da62e2ba4a328d7e4ab,
except for directories instead of device nodes.
Diffstat (limited to 'internal/nametransform/diriv.go')
| -rw-r--r-- | internal/nametransform/diriv.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/internal/nametransform/diriv.go b/internal/nametransform/diriv.go index ffaf785..fe289c6 100644 --- a/internal/nametransform/diriv.go +++ b/internal/nametransform/diriv.go @@ -75,16 +75,17 @@ func fdReadDirIV(fd *os.File) (iv []byte, err error) { // WriteDirIV - create diriv file inside "dir" (absolute ciphertext path) // This function is exported because it is used from pathfs_frontend, main, // and also the automated tests. -func WriteDirIV(dir string) error { +func WriteDirIV(dirfd *os.File, dir string) error { iv := cryptocore.RandBytes(DirIVLen) file := filepath.Join(dir, DirIVFilename) // 0400 permissions: gocryptfs.diriv should never be modified after creation. // Don't use "ioutil.WriteFile", it causes trouble on NFS: https://github.com/rfjakob/gocryptfs/issues/105 - fd, err := os.OpenFile(file, os.O_WRONLY|os.O_CREATE|os.O_EXCL, 0400) + fdRaw, err := syscallcompat.Openat(int(dirfd.Fd()), file, os.O_WRONLY|os.O_CREATE|os.O_EXCL, 0400) if err != nil { - tlog.Warn.Printf("WriteDirIV: OpenFile: %v", err) + tlog.Warn.Printf("WriteDirIV: Openat: %v", err) return err } + fd := os.NewFile(uintptr(fdRaw), file) _, err = fd.Write(iv) if err != nil { tlog.Warn.Printf("WriteDirIV: Write: %v", err) |