Commitaf89c02

committed

notify_socket: close fds on error

Reported in issue 5008.Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>

1 parent8702e12 commitaf89c02Copy full SHA for af89c02

File tree

-1

lines changed

-1

lines changed

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -175,12 +175,18 @@ func notifyHost(client *net.UnixConn, ready []byte, pid1 int) error {`
`175`	`175`	`varerrUnexpectedRead=errors.New("unexpected read from synchronization pipe")`
`176`	`176`
`177`	`177`	`// sdNotifyBarrier performs synchronization with systemd by means of the sd_notify_barrier protocol.`
`178`		`-funcsdNotifyBarrier(client*net.UnixConn)error {`
	`178`	`+funcsdNotifyBarrier(client*net.UnixConn)(retErrerror) {`
`179`	`179`	`// Create a pipe for communicating with systemd daemon.`
`180`	`180`	`pipeR,pipeW,err:=os.Pipe()`
`181`	`181`	`iferr!=nil {`
`182`	`182`	`returnerr`
`183`	`183`	`}`
	`184`	`+deferfunc() {`
	`185`	`+ifretErr!=nil {`
	`186`	`+pipeW.Close()`
	`187`	`+pipeR.Close()`
	`188`	`+}`
	`189`	`+}()`
`184`	`190`
`185`	`191`	`// Get the FD for the unix socket file to be able to use sendmsg.`
`186`	`192`	`clientFd,err:=client.File()`

Comments

(0)