From: djm@openbsd.org <djm@openbsd.org>
Date: Tue, 28 Feb 2017 06:10:08 +0000 (+0000)
Subject: upstream commit
X-Git-Tag: V_7_5_P1~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7abb771bd5a941b26144ba400a34563a1afa589;p=thirdparty%2Fopenssh-portable.git

upstream commit

small memleak: free fd_set on connection timeout (though
we are heading to exit anyway). From Tom Rix in bz#2683

Upstream-ID: 10e3dadbb8199845b66581473711642d9e6741c4
---

diff --git a/packet.c b/packet.c
index 94e8460ca..01e2d45bd 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.245 2017/02/03 23:03:33 djm Exp $ */
+/* $OpenBSD: packet.c,v 1.246 2017/02/28 06:10:08 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1466,8 +1466,10 @@ ssh_packet_read_seqnr(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p)
 				break;
 			}
 		}
-		if (r == 0)
-			return SSH_ERR_CONN_TIMEOUT;
+		if (r == 0) {
+			r = SSH_ERR_CONN_TIMEOUT;
+			goto out;
+		}
 		/* Read data from the socket. */
 		len = read(state->connection_in, buf, sizeof(buf));
 		if (len == 0) {