From nobody Tue Oct 04 21:17:24 2022 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 4MhrBX6Qbcz4dkZj; Tue, 4 Oct 2022 21:17:24 +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 4MhrBX5FmYz3HQK; Tue, 4 Oct 2022 21:17:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664918244; 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=RZnn6fZY3K7QOGu/8lo5w7+X9oJ2Qpy6/i9VtVSxdbU=; b=DSh/BHXl5Jn9sZIBdpzEXD+lGf7dD6kIlJ4Mvo4ZVY5zW8/FFAc6GnPucJn3BjU/9Umeje 7UeoO3ha4/kuNxfYsxmm6/193CaC50BxSGcVY4oUpj2I4UcrGerQknHTW8lLwnft2P5AZA fTat5pTDl/30Qw4m1jyMh0FmRfmhc3bQFiUOEphkuYzJhBNB5Ipd0EA4cA1uyte/6nnzq+ V9pLxu274iV/U439YbI29alvLUBn+7MjDM4ZN9gHz5QzG+dk3vTwc4DLL0IPVT0Wqn/0bz 35kPoBJUdEuAuVAIIZRGPSq37A2ppaYrZOK50yEMHO7UippDyFiNj7ECA4NPYw== 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 4MhrBX46THzh7n; Tue, 4 Oct 2022 21:17:24 +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 294LHOlM012381; Tue, 4 Oct 2022 21:17:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 294LHO9w012380; Tue, 4 Oct 2022 21:17:24 GMT (envelope-from git) Date: Tue, 4 Oct 2022 21:17:24 GMT Message-Id: <202210042117.294LHO9w012380@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: 666605ad2df3 - main - ssh-keygen: fix double free in error path 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: 666605ad2df3f5c1fb973dbd719ffbe3f3935c1d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664918244; 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=RZnn6fZY3K7QOGu/8lo5w7+X9oJ2Qpy6/i9VtVSxdbU=; b=fXeppOiFklLGYn3hDzbwznDfOUb7FBWd1ILvoQpA0XAGFem6znqmAYF34LsR8kejp70LJV RWxMphFqtkBWDIESppvxa6f0+7ilBcXgWIKcJrnXKHd4L+HwzDjXWhoZtVFLCvhpSEq+K5 7gll/Jo0rzr8aPLoOXg3k2wCLmeRHLjyA6wzfLWKBp29UPZ6U9CWqVQ54n9hgI4CFquZgY L8dJkIVwy23uwSZAR48mqftonJps63HtxYYPYjGmbGeTgaGQ9/z+8yB1vWDpCdSh86AKvQ OmQgmexYt+GW4lhz/JFJ3k+gCveeQqz9J0jaU/3vHBteUhgTdHsAffjPzyDcIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664918244; a=rsa-sha256; cv=none; b=dsTUnOjiy3TgNWJeC0fDook1S2HLtOn4/xL1IjzJjtmfn7NGAOMj/WLkSrgNu/Ue35AKoH BKJ7wLpETOpkrC8R3Laro32a+zBUBTnskw7fnlh97KMM0hBnwzWpSKxp7zO0FFmPwRO8M7 eOYa6E96mR61GDnxkXciPcwjTk3gTioEk+jNG8cysgFac215H6GiqBLnk7KKUxZ8UPhchm Hh0pErQ8jOF2OwQCQNJmBiEAdQaMmWNN4oD1aivh2WLqIh1D0AxDbtSXRLD2/BhMdtQ1no 6K2V03Bq4DVAfwmFxr8D2D5ZA757Q6gbzpxSjdApiMexb1M23k0xisjvoCv97w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=666605ad2df3f5c1fb973dbd719ffbe3f3935c1d commit 666605ad2df3f5c1fb973dbd719ffbe3f3935c1d Author: Ed Maste AuthorDate: 2022-10-04 20:31:39 +0000 Commit: Ed Maste CommitDate: 2022-10-04 20:33:11 +0000 ssh-keygen: fix double free in error path From OpenSSH-portable commit 5062ad48814b, OpenBSD commit 39f35e16ba87. MFC after: 3 days --- crypto/openssh/sshsig.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/crypto/openssh/sshsig.c b/crypto/openssh/sshsig.c index 1e3b63982ba8..eb2a931e9c18 100644 --- a/crypto/openssh/sshsig.c +++ b/crypto/openssh/sshsig.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshsig.c,v 1.29 2022/03/30 04:27:51 djm Exp $ */ +/* $OpenBSD: sshsig.c,v 1.30 2022/08/19 03:06:30 djm Exp $ */ /* * Copyright (c) 2019 Google LLC * @@ -491,7 +491,7 @@ hash_file(int fd, const char *hashalg, struct sshbuf **bp) { char *hex, rbuf[8192], hash[SSH_DIGEST_MAX_LENGTH]; ssize_t n, total = 0; - struct ssh_digest_ctx *ctx; + struct ssh_digest_ctx *ctx = NULL; int alg, oerrno, r = SSH_ERR_INTERNAL_ERROR; struct sshbuf *b = NULL; @@ -514,7 +514,6 @@ hash_file(int fd, const char *hashalg, struct sshbuf **bp) continue; oerrno = errno; error_f("read: %s", strerror(errno)); - ssh_digest_free(ctx); errno = oerrno; r = SSH_ERR_SYSTEM_ERROR; goto out; @@ -549,9 +548,11 @@ hash_file(int fd, const char *hashalg, struct sshbuf **bp) /* success */ r = 0; out: + oerrno = errno; sshbuf_free(b); ssh_digest_free(ctx); explicit_bzero(hash, sizeof(hash)); + errno = oerrno; return r; }