hardcoresushi/libgocryptfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

syscallcompat: Openat: retry on EINTR

Browse Source 
Towards fixing https://github.com/rfjakob/gocryptfs/issues/507
This commit is contained in:
Jakob Unterwurzacher 2020-10-11 01:31:09 +02:00
parent fe340477b2
commit 803fdf410b
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
internal/syscallcompat/sys_common.go
View File

@ -44,7 +44,7 @@ func Faccessat(dirfd int, path string, mode uint32) error {
return unix.Faccessat(dirfd, path, mode, 0) return unix.Faccessat(dirfd, path, mode, 0)
} }
// Openat wraps the Openat syscall. // Openat wraps the Openat syscall, retrying on EINTR.
func Openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) { func Openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
if flags&syscall.O_CREAT != 0 { if flags&syscall.O_CREAT != 0 {
// O_CREAT should be used with O_EXCL. O_NOFOLLOW has no effect with O_EXCL. // O_CREAT should be used with O_EXCL. O_NOFOLLOW has no effect with O_EXCL.
@ -59,7 +59,14 @@ func Openat(dirfd int, path string, flags int, mode uint32) (fd int, err error)
flags |= syscall.O_NOFOLLOW flags |= syscall.O_NOFOLLOW
} }
} }
return unix.Openat(dirfd, path, flags, mode) // Like ignoringEINTR() in the Go stdlib:
// https://github.com/golang/go/blob/d2a80f3fb5b44450e0b304ac5a718f99c053d82a/src/os/file_posix.go#L243
for {
fd, err = unix.Openat(dirfd, path, flags, mode)
if err != unix.EINTR {
return fd, err
}
}
} }
// Renameat wraps the Renameat syscall. // Renameat wraps the Renameat syscall.