summaryrefslogtreecommitdiff
path: root/sshconnect.c
diff options
context:
space:
mode:
authormarkus@openbsd.org <markus@openbsd.org>2016-01-14 22:56:56 +0000
committerDamien Miller <djm@mindrot.org>2016-01-27 16:54:10 +1100
commitfc77ccdc2ce6d5d06628b8da5048a6a5f6ffca5a (patch)
tree6f660fa95a43f925c05d3ee208af08c45de4a125 /sshconnect.c
parenta306863831c57ec5fad918687cc5d289ee8e2635 (diff)
downloadopenssh-git-fc77ccdc2ce6d5d06628b8da5048a6a5f6ffca5a.tar.gz
upstream commit
fd leaks; report Qualys Security Advisory team; ok deraadt@ Upstream-ID: 4ec0f12b9d8fa202293c9effa115464185aa071d
Diffstat (limited to 'sshconnect.c')
-rw-r--r--sshconnect.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sshconnect.c b/sshconnect.c
index a22710d9..356ec79f 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect.c,v 1.270 2016/01/14 16:17:40 markus Exp $ */
+/* $OpenBSD: sshconnect.c,v 1.271 2016/01/14 22:56:56 markus Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -167,6 +167,7 @@ ssh_proxy_fdpass_connect(const char *host, u_short port,
if ((sock = mm_receive_fd(sp[1])) == -1)
fatal("proxy dialer did not pass back a connection");
+ close(sp[1]);
while (waitpid(pid, NULL, 0) == -1)
if (errno != EINTR)