[release-branch.go1.12] os: enable the close-on-exec flag for openFdAt

oiooj · ianlancetaylor · commit 047a326569a5 · 2019-08-02T04:53:33.000Z
There's a race here with fork/exec, enable the close-on-exec flag for the new file descriptor. Updates #33405 Fixes #33424 Change-Id: Ib1e405c3b48b11c867f183fd13eff8b73d95e3b4 Reviewed-on: https://go-review.googlesource.com/c/go/+/188537 Run-TryBot: Baokun Lee <nototon@gmail.com> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Ian Lance Taylor <iant@golang.org> (cherry picked from commit 2d6ee6e) Reviewed-on: https://go-review.googlesource.com/c/go/+/188538 Run-TryBot: Ian Lance Taylor <iant@golang.org>
diff --git a/src/os/removeall_at.go b/src/os/removeall_at.go
@@ -157,7 +157,7 @@ func openFdAt(dirfd int, name string) (*File, error) {
 	var r int
 	for {
 		var e error
-		r, e = unix.Openat(dirfd, name, O_RDONLY, 0)
+		r, e = unix.Openat(dirfd, name, O_RDONLY|syscall.O_CLOEXEC, 0)
 		if e == nil {
 			break
 		}

Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ func openFdAt(dirfd int, name string) (*File, error) {`
`157`	`157`	`var r int`
`158`	`158`	`for {`
`159`	`159`	`var e error`
`160`		`- r, e = unix.Openat(dirfd, name, O_RDONLY, 0)`
	`160`	`+ r, e = unix.Openat(dirfd, name, O_RDONLY\|syscall.O_CLOEXEC, 0)`
`161`	`161`	`if e == nil {`
`162`	`162`	`break`
`163`	`163`	`}`