os: enable the close-on-exec flag for openFdAt

oiooj · ianlancetaylor · commit 2d6ee6e89a4b · 2019-08-01T20:37:08.000Z
There's a race here with fork/exec, enable the close-on-exec flag for the new file descriptor. Fixes #33405 Change-Id: If95bae97a52b7026a930bb3427e47bae3b0032ac 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>
diff --git a/src/os/removeall_at.go b/src/os/removeall_at.go
@@ -173,7 +173,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
`@@ -173,7 +173,7 @@ func openFdAt(dirfd int, name string) (*File, error) {`
`173`	`173`	`var r int`
`174`	`174`	`for {`
`175`	`175`	`var e error`
`176`		`- r, e = unix.Openat(dirfd, name, O_RDONLY, 0)`
	`176`	`+ r, e = unix.Openat(dirfd, name, O_RDONLY\|syscall.O_CLOEXEC, 0)`
`177`	`177`	`if e == nil {`
`178`	`178`	`break`
`179`	`179`	`}`