From: djm <djm>
Date: Sun, 10 Feb 2008 11:22:53 +0000 (+0000)
Subject:    - djm@cvs.openbsd.org 2008/01/19 20:48:53
X-Git-Tag: V_4_9_P1~80
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/4d6760a79c5e231772ce33c7ac40dd4a53ccaa7f

   - djm@cvs.openbsd.org 2008/01/19 20:48:53
     [clientloop.c]
     fd leak on session multiplexing error path. Report and patch from
     gregory_shively AT fanniemae.com
---

diff --git a/ChangeLog b/ChangeLog
index 8706a15d..3573e017 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,10 @@
      [ssh.1]
      satisfy the pedants: -q does not suppress all diagnostic messages (e.g.
      some commandline parsing warnings go unconditionally to stdout).
+   - djm@cvs.openbsd.org 2008/01/19 20:48:53
+     [clientloop.c]
+     fd leak on session multiplexing error path. Report and patch from
+     gregory_shively AT fanniemae.com
 
 20080119
  - (djm) Silence noice from expr in ssh-copy-id; patch from
diff --git a/clientloop.c b/clientloop.c
index 109df4ca..19561506 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.185 2007/12/28 22:34:47 dtucker Exp $ */
+/* $OpenBSD: clientloop.c,v 1.186 2008/01/19 20:48:53 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -888,6 +888,7 @@ client_process_control(fd_set *readset)
 				xfree(cctx->env);
 			xfree(cctx->term);
 			buffer_free(&cctx->cmd);
+			close(client_fd);
 			xfree(cctx);
 			return;
 		}