diff options
| author | Sebastien Marie <semarie@cvs.openbsd.org> | 2020-06-26 11:26:02 +0000 |
|---|---|---|
| committer | Sebastien Marie <semarie@cvs.openbsd.org> | 2020-06-26 11:26:02 +0000 |
| commit | 57e118857cf20e8b05d86903f975bbab23bfd9ea (patch) | |
| tree | aaf8c743ff6fa8ce8dfdc46aa4344a48f2fc8bc7 /usr.bin/ssh/packet.c | |
| parent | 2ff8aa385198a807b270f3154bba5a32eeebff60 (diff) | |
backout 1.293 fix kex mem-leak in ssh_packet_close at markus request
the change introduced a NULL deref in sshpkt_vfatal() (uses of ssh->kex after
calling ssh_packet_clear_keys())
Diffstat (limited to 'usr.bin/ssh/packet.c')
| -rw-r--r-- | usr.bin/ssh/packet.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/usr.bin/ssh/packet.c b/usr.bin/ssh/packet.c index 02011bfc34b..0b326e9f7dc 100644 --- a/usr.bin/ssh/packet.c +++ b/usr.bin/ssh/packet.c @@ -1,4 +1,4 @@ -/* $OpenBSD: packet.c,v 1.293 2020/06/24 15:12:09 markus Exp $ */ +/* $OpenBSD: packet.c,v 1.294 2020/06/26 11:26:01 semarie Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -591,8 +591,6 @@ 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) { |