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

OpenBSD-Commit-ID: e2e9533f393620383afd0b68ef435de8d5e8abe4

diff --git a/packet.c b/packet.c
index 4cce4133ae8c02b11b090a351ad833b50318d2e5..4780356f2e2554d61f260b10c163dd9d2ec39814 100644 (file)
--- 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) {