[openssh-commits] [openssh] 02/03: upstream: Roll back previous KEX changes as they aren't safe until

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 2369a2810187e08f2af5d58b343956062fb96ee8
Author: dtucker at openbsd.org <dtucker at openbsd.org>
Date:   Fri Jun 24 10:45:06 2022 +0000

    upstream: Roll back previous KEX changes as they aren't safe until
    
    compat_pkalg_proposal and friends always allocate their returned strings.
    Reported by Qualys.
    
    OpenBSD-Commit-ID: 1c7a88a0d5033f42f88ab9bec58ef1cf72c81ad0
---
 sshconnect2.c | 10 ++++------
 sshd.c        |  8 ++------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/sshconnect2.c b/sshconnect2.c
index 583d292b..5f87221b 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect2.c,v 1.357 2022/06/24 04:37:00 dtucker Exp $ */
+/* $OpenBSD: sshconnect2.c,v 1.358 2022/06/24 10:45:06 dtucker Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2008 Damien Miller.  All rights reserved.
@@ -114,7 +114,6 @@ first_alg(const char *algs)
 	return ret;
 }
 
-/* Returns an allocated string that the caller must free. */
 static char *
 order_hostkeyalgs(char *host, struct sockaddr *hostaddr, u_short port,
     const struct ssh_conn_info *cinfo)
@@ -218,7 +217,7 @@ ssh_kex2(struct ssh *ssh, char *host, struct sockaddr *hostaddr, u_short port,
     const struct ssh_conn_info *cinfo)
 {
 	char *myproposal[PROPOSAL_MAX] = { KEX_CLIENT };
-	char *s, *all_key, *hostkeyalgs = NULL;
+	char *s, *all_key;
 	int r, use_known_hosts_order = 0;
 
 	xxx_host = host;
@@ -256,10 +255,9 @@ ssh_kex2(struct ssh *ssh, char *host, struct sockaddr *hostaddr, u_short port,
 	    myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs;
 	if (use_known_hosts_order) {
 		/* Query known_hosts and prefer algorithms that appear there */
-		hostkeyalgs = order_hostkeyalgs(host, hostaddr, port, cinfo);
 		myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] =
-		    compat_pkalg_proposal(ssh, hostkeyalgs);
-		free(hostkeyalgs);
+		    compat_pkalg_proposal(ssh,
+		    order_hostkeyalgs(host, hostaddr, port, cinfo));
 	} else {
 		/* Use specified HostkeyAlgorithms exactly */
 		myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] =
diff --git a/sshd.c b/sshd.c
index 747ba1f7..d80b5e0b 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.587 2022/06/24 04:37:00 dtucker Exp $ */
+/* $OpenBSD: sshd.c,v 1.588 2022/06/24 10:45:06 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo at cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -603,7 +603,6 @@ 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)
 {
@@ -2368,7 +2367,6 @@ static void
 do_ssh2_kex(struct ssh *ssh)
 {
 	char *myproposal[PROPOSAL_MAX] = { KEX_SERVER };
-	char *hostkey_types = NULL;
 	struct kex *kex;
 	int r;
 
@@ -2390,10 +2388,8 @@ 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, hostkey_types);
-	free(hostkey_types);
+	    ssh, list_hostkey_types());
 
 	/* start key exchange */
 	if ((r = kex_setup(ssh, myproposal)) != 0)

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.