From: markus@openbsd.org <markus@openbsd.org>
Date: Wed, 24 Jun 2020 15:12:09 +0000 (+0000)
Subject: upstream: fix kex mem-leak in ssh_packet_close; ok djm
X-Git-Tag: V_8_4_P1~108
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07f5f369a25e228a7357ef6c57205f191f073d99;p=thirdparty%2Fopenssh-portable.git

upstream: fix kex mem-leak in ssh_packet_close; ok djm

OpenBSD-Commit-ID: e2e9533f393620383afd0b68ef435de8d5e8abe4
---

diff --git a/packet.c b/packet.c
index 4cce4133a..4780356f2 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.292 2020/06/24 15:10:38 markus Exp $ */
+/* $OpenBSD: packet.c,v 1.293 2020/06/24 15:12:09 markus Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -616,6 +616,8 @@ ssh_packet_close_internal(struct ssh *ssh, int do_close)
 		state->newkeys[mode] = NULL;
 		ssh_clear_newkeys(ssh, mode);		/* next keys */
 	}
+	kex_free(ssh->kex);
+	ssh->kex = NULL;
 #ifdef WITH_ZLIB
 	/* compression state is in shared mem, so we can only release it once */
 	if (do_close && state->compression_buffer) {