port/builtin: fix FD leak

Fix rootless-containers#156 Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
AkihiroSuda · Jul 28, 2020 · 3ebea46 · 3ebea46
1 parent 263cab0
commit 3ebea46
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/pkg/port/builtin/child/child.go b/pkg/port/builtin/child/child.go
@@ -119,11 +119,13 @@ func (d *childDriver) handleConnectRequest(c *net.UnixConn, req *msg.Request) er
 	if err != nil {
 		return err
 	}
+	defer targetConnFile.Close()
 	oob := unix.UnixRights(int(targetConnFile.Fd()))
 	f, err := c.File()
 	if err != nil {
 		return err
 	}
+	defer f.Close()
 	for {
 		err = unix.Sendmsg(int(f.Fd()), []byte("dummy"), oob, nil, 0)
 		if err != unix.EINTR {