From nobody Mon Feb 6 16:31:37 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P9Wx604H1z3mvV9; Mon, 6 Feb 2023 16:31:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P9Wx56lvDz4LH7; Mon, 6 Feb 2023 16:31:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675701097; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EeeiADrdEhGJvTKn93VAiFx2VDYyejq5sQOG2+WNGhQ=; b=I1vlVTS91JNgqSdMCHk2CpuCzMBdSasYSLny0+1CfsAjxfj4eaE1mOB9cnIppaYtJVBg1Y LVDcTOtuoxXdMNft0IhKsOOVgvhsvfYkQTmuxZYlDm6QJVC4PwE989RlslodFg+A/fqLtk Us1IDBTdC2fbR88OjBDoXUBgInA/bZ4IHdveK4IrSDPLv/hAeTARN6XYnRmYc1DLc98SYU aNfA0SIOwNauWsCG37ZLStGvQyYRRBuN5+fcK8ccCy89DHUzdIWfuYlMth0DcSQUsRypvE kwRFgVRVTq0tZ34NR5Z3hCIMqUxd6nXjffWLyDie/KTij6H1aa/37Nk9ZrgZ1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675701097; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EeeiADrdEhGJvTKn93VAiFx2VDYyejq5sQOG2+WNGhQ=; b=jswaKi7CfJQqLxFR8yDN3OXENWCOlGJbrVt46lYvoH106EjnNHOjvAMh+RmCI38wrI6CuI 5g+ubbOP/c5QXukDCIUiHV+xUAtCgnTyLVKrfIyhQ3fLeGIYYCLobzcig4VK3Wkq0LRxDU hTJy8ixjp++8bm5kex6Jp81CKXH9X0zHsRJyOMUktfD7Y1lBZFTVulzlo73pYRACiT2XXf l6DArgbRUghZhfWp/eImLheOCbtDTQksE0x6wr4RrSc3R92ZtAZqDmKMBT/lU7qOoBvNp4 m5pfT1oEOx1x5srI9bTAISK1/XjxUwk9tYNbe0hPctUKacWdvi9Tpe/lxAExWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675701097; a=rsa-sha256; cv=none; b=Uw1RoUAx7wzhRN+Pq+A415S1nQ6vbtff7cRos9wMYJk+HZ22ssYl9zl0PHAGzuOYs0cIYM FqDTU0O0Mbfz6wLVxi6HVy64JEzBfUA5Bsz4fxX+voL0dG0SK1+k+JCz96u9BgNJYiJEFb c9NWLMLA5ZxrPOk+T06vWMYjlutL+vslaY+9sIZS+2Ug24eVkb2oB12+57F2CvH9FQxlWr ZMKSGXag35HFHoo0NOpLpb0wCtEBf/pEkRYeOgGbyOgFN67bkcXShhmZ+7dgNj0XtXsMLu WbrwD3g2pxd8V8yQHFOcefHZIwHBSAQMiVgdPJN0b1Pz0uNNKXgrar/fifzV2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P9Wx55qL8zhdy; Mon, 6 Feb 2023 16:31:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 316GVbqf055580; Mon, 6 Feb 2023 16:31:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 316GVbb5055579; Mon, 6 Feb 2023 16:31:37 GMT (envelope-from git) Date: Mon, 6 Feb 2023 16:31:37 GMT Message-Id: <202302061631.316GVbb5055579@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: fe1371e8f3d7 - main - ssh: fix double-free caused by compat_kex_proposal() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fe1371e8f3d7336748d291a7360b2aacce943fb1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=fe1371e8f3d7336748d291a7360b2aacce943fb1 commit fe1371e8f3d7336748d291a7360b2aacce943fb1 Author: Ed Maste AuthorDate: 2023-02-06 16:26:08 +0000 Commit: Ed Maste CommitDate: 2023-02-06 16:31:18 +0000 ssh: fix double-free caused by compat_kex_proposal() Security: CVE-2023-25136 Obtained from: OpenSSH-portable commit 12da78233364 Sponsored by: The FreeBSD Foundation --- crypto/openssh/compat.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/crypto/openssh/compat.c b/crypto/openssh/compat.c index 46dfe3a9c2e7..478a9403eeaa 100644 --- a/crypto/openssh/compat.c +++ b/crypto/openssh/compat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: compat.c,v 1.120 2022/07/01 03:35:45 dtucker Exp $ */ +/* $OpenBSD: compat.c,v 1.121 2023/02/02 12:10:05 djm Exp $ */ /* * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved. * @@ -190,26 +190,26 @@ compat_pkalg_proposal(struct ssh *ssh, char *pkalg_prop) char * compat_kex_proposal(struct ssh *ssh, char *p) { - char *cp = NULL; + char *cp = NULL, *cp2 = NULL; if ((ssh->compat & (SSH_BUG_CURVE25519PAD|SSH_OLD_DHGEX)) == 0) return xstrdup(p); debug2_f("original KEX proposal: %s", p); if ((ssh->compat & SSH_BUG_CURVE25519PAD) != 0) - if ((p = match_filter_denylist(p, + if ((cp = match_filter_denylist(p, "curve25519-sha256@libssh.org")) == NULL) fatal("match_filter_denylist failed"); if ((ssh->compat & SSH_OLD_DHGEX) != 0) { - cp = p; - if ((p = match_filter_denylist(p, + if ((cp2 = match_filter_denylist(cp ? cp : p, "diffie-hellman-group-exchange-sha256," "diffie-hellman-group-exchange-sha1")) == NULL) fatal("match_filter_denylist failed"); free(cp); + cp = cp2; } - debug2_f("compat KEX proposal: %s", p); - if (*p == '\0') + if (cp == NULL || *cp == '\0') fatal("No supported key exchange algorithms found"); - return p; + debug2_f("compat KEX proposal: %s", cp); + return cp; }