github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Use O_CLOEXEC for volume subpath util

Browse Source 
This prevents fd's from leaking to subprocesses.
This commit is contained in:
Brian Goff 2019-03-15 12:17:05 -07:00
parent 45b0261290
commit 0051db89a7
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/volume/util/subpath/subpath_linux.go
View File

@ -398,7 +398,7 @@ func doSafeMakeDir(pathname string, base string, perm os.FileMode) error {
return fmt.Errorf("cannot create directory %s: %s", currentPath, err) return fmt.Errorf("cannot create directory %s: %s", currentPath, err)
} }
// Dive into the created directory // Dive into the created directory
childFD, err = syscall.Openat(parentFD, dir, nofollowFlags, 0) childFD, err = syscall.Openat(parentFD, dir, nofollowFlags|unix.O_CLOEXEC, 0)
if err != nil { if err != nil {
return fmt.Errorf("cannot open %s: %s", currentPath, err) return fmt.Errorf("cannot open %s: %s", currentPath, err)
} }
@ -454,7 +454,7 @@ func findExistingPrefix(base, pathname string) (string, []string, error) {
// This should be faster than looping through all dirs and calling os.Stat() // This should be faster than looping through all dirs and calling os.Stat()
// on each of them, as the symlinks are resolved only once with OpenAt(). // on each of them, as the symlinks are resolved only once with OpenAt().
currentPath := base currentPath := base
fd, err := syscall.Open(currentPath, syscall.O_RDONLY, 0) fd, err := syscall.Open(currentPath, syscall.O_RDONLY|syscall.O_CLOEXEC, 0)
if err != nil { if err != nil {
return pathname, nil, fmt.Errorf("error opening %s: %s", currentPath, err) return pathname, nil, fmt.Errorf("error opening %s: %s", currentPath, err)
} }
@ -466,7 +466,7 @@ func findExistingPrefix(base, pathname string) (string, []string, error) {
for i, dir := range dirs { for i, dir := range dirs {
// Using O_PATH here will prevent hangs in case user replaces directory with // Using O_PATH here will prevent hangs in case user replaces directory with
// fifo // fifo
childFD, err := syscall.Openat(fd, dir, unix.O_PATH, 0) childFD, err := syscall.Openat(fd, dir, unix.O_PATH|unix.O_CLOEXEC, 0)
if err != nil { if err != nil {
if os.IsNotExist(err) { if os.IsNotExist(err) {
return currentPath, dirs[i:], nil return currentPath, dirs[i:], nil
@ -499,7 +499,7 @@ func doSafeOpen(pathname string, base string) (int, error) {
// Assumption: base is the only directory that we have under control. // Assumption: base is the only directory that we have under control.
// Base dir is not allowed to be a symlink. // Base dir is not allowed to be a symlink.
parentFD, err := syscall.Open(base, nofollowFlags, 0) parentFD, err := syscall.Open(base, nofollowFlags|unix.O_CLOEXEC, 0)
if err != nil { if err != nil {
return -1, fmt.Errorf("cannot open directory %s: %s", base, err) return -1, fmt.Errorf("cannot open directory %s: %s", base, err)
} }
@ -531,7 +531,7 @@ func doSafeOpen(pathname string, base string) (int, error) {
} }
klog.V(5).Infof("Opening path %s", currentPath) klog.V(5).Infof("Opening path %s", currentPath)
childFD, err = syscall.Openat(parentFD, seg, openFDFlags, 0) childFD, err = syscall.Openat(parentFD, seg, openFDFlags|unix.O_CLOEXEC, 0)
if err != nil { if err != nil {
return -1, fmt.Errorf("cannot open %s: %s", currentPath, err) return -1, fmt.Errorf("cannot open %s: %s", currentPath, err)
} }

2
pkg/volume/util/subpath/subpath_nsenter_test.go
View File

@ -83,7 +83,7 @@ func TestCheckDeviceInode(t *testing.T) {
continue continue
} }
fd, err := unix.Open(test.srcPath, unix.O_CREAT, 0644) fd, err := unix.Open(test.srcPath, unix.O_CREAT|unix.O_CLOEXEC, 0644)
if err != nil { if err != nil {
t.Errorf("Test %q: cannot open srcPath %s: %s", test.name, test.srcPath, err) t.Errorf("Test %q: cannot open srcPath %s: %s", test.name, test.srcPath, err)
continue continue