Also create epoll and pipe fds with close-on-exec (fsnotify#155) (fsnotify#219)

JohannesEbke · cpuguy83 · commit 1485a34d5d57 · 2019-03-12T11:14:46.000-07:00
* Add the unix.O_CLOEXEC to the Pipe2 call
* Add unix.EPOLL_CLOEXEC to the Epoll call
diff --git a/inotify_poller.go b/inotify_poller.go
@@ -40,12 +40,12 @@ func newFdPoller(fd int) (*fdPoller, error) {
 	poller.fd = fd
 
 	// Create epoll fd
-	poller.epfd, errno = unix.EpollCreate1(0)
+	poller.epfd, errno = unix.EpollCreate1(unix.EPOLL_CLOEXEC)
 	if poller.epfd == -1 {
 		return nil, errno
 	}
 	// Create pipe; pipe[0] is the read end, pipe[1] the write end.
-	errno = unix.Pipe2(poller.pipe[:], unix.O_NONBLOCK)
+	errno = unix.Pipe2(poller.pipe[:], unix.O_NONBLOCK|unix.O_CLOEXEC)
 	if errno != nil {
 		return nil, errno
 	}

Original file line number	Diff line number	Diff line change
`@@ -40,12 +40,12 @@ func newFdPoller(fd int) (*fdPoller, error) {`
`40`	`40`	`poller.fd = fd`
`41`	`41`
`42`	`42`	`// Create epoll fd`
`43`		`- poller.epfd, errno = unix.EpollCreate1(0)`
	`43`	`+ poller.epfd, errno = unix.EpollCreate1(unix.EPOLL_CLOEXEC)`
`44`	`44`	`if poller.epfd == -1 {`
`45`	`45`	`return nil, errno`
`46`	`46`	`}`
`47`	`47`	`// Create pipe; pipe[0] is the read end, pipe[1] the write end.`
`48`		`- errno = unix.Pipe2(poller.pipe[:], unix.O_NONBLOCK)`
	`48`	`+ errno = unix.Pipe2(poller.pipe[:], unix.O_NONBLOCK\|unix.O_CLOEXEC)`
`49`	`49`	`if errno != nil {`
`50`	`50`	`return nil, errno`
`51`	`51`	`}`