diff options
| author | Darren Tucker <dtucker@cvs.openbsd.org> | 2022-06-24 04:37:01 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@cvs.openbsd.org> | 2022-06-24 04:37:01 +0000 |
| commit | df8581f07fdc6c3beb91a7268eaabfd3c8617e7d (patch) | |
| tree | 594516b77d85c22b42549d785fca2360feacfae6 /usr.bin/ssh/sshd.c | |
| parent | 9c84864d4581c1f74466fcb01c3b17e74ec2a334 (diff) | |
Don't leak the strings allocated by order_hostkeyalgs() and
list_hostkey_types() that are passed to compat_pkalg_proposal().
Part of github PR#324 from ZoltanFridrich, ok djm@
Diffstat (limited to 'usr.bin/ssh/sshd.c')
| -rw-r--r-- | usr.bin/ssh/sshd.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c index d6fbbef7741..f91e04a574e 100644 --- a/usr.bin/ssh/sshd.c +++ b/usr.bin/ssh/sshd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshd.c,v 1.586 2022/06/17 01:00:03 dtucker Exp $ */ +/* $OpenBSD: sshd.c,v 1.587 2022/06/24 04:37:00 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -560,6 +560,7 @@ append_hostkey_type(struct sshbuf *b, const char *s) fatal_fr(r, "sshbuf_putf"); } +/* Returns an allocated string that the caller must free. */ static char * list_hostkey_types(void) { @@ -2194,6 +2195,7 @@ static void do_ssh2_kex(struct ssh *ssh) { char *myproposal[PROPOSAL_MAX] = { KEX_SERVER }; + char *hostkey_types = NULL; struct kex *kex; int r; @@ -2215,8 +2217,10 @@ do_ssh2_kex(struct ssh *ssh) ssh_packet_set_rekey_limits(ssh, options.rekey_limit, options.rekey_interval); + hostkey_types = list_hostkey_types(); myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = compat_pkalg_proposal( - ssh, list_hostkey_types()); + ssh, hostkey_types); + free(hostkey_types); /* start key exchange */ if ((r = kex_setup(ssh, myproposal)) != 0) |