From nobody Fri Oct 07 01:39:43 2022 X-Original-To: dev-commits-src-all@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 4Mk9wJ1VR8z4f0q9; Fri, 7 Oct 2022 01:39:44 +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 4Mk9wH6CXFz488W; Fri, 7 Oct 2022 01:39:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665106784; 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=az/J/DbmRg9TfrlSJWFASZGAb1OJpLPyv/KGqsHzdGE=; b=Yhu9Os94/c2ktVmGKsjhmZHE/xLvpfVJBeDnhrZ4xwjY7lokFVyv5eSeKJvQojTftxm9LL GdXeDUIXrN/vWF0bQwbWJnJ/MItleCZYn/RNWSOrwNHG51umxKaPxbQ/xH6tFyTnxSkTnh cCW2G+5GPymYHj7nHh7djpRr9TFACQJxWIxwiutbzkNqoUAwQe3uzX1yjCtQREycU0ppp+ JadqABtQt0d/tQFUFRuqwbuZdm+YX1T09KUMq3dVlsLHHYhpvGX2xEX3+86JjRTCv0mVJk RmFZfIXV7c/Avr3yMtprNjSzB8UzPH+4Kl39jyw1qjZyQ8rLnGTo3q+T/Gr96Q== 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 4Mk9wH4brjzRVm; Fri, 7 Oct 2022 01:39:43 +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 2971dhhs016251; Fri, 7 Oct 2022 01:39:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2971dhPM016250; Fri, 7 Oct 2022 01:39:43 GMT (envelope-from git) Date: Fri, 7 Oct 2022 01:39:43 GMT Message-Id: <202210070139.2971dhPM016250@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 02c646bb7288 - stable/13 - ssh-keygen: fix double free in error path List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 02c646bb7288986912ad7bbe410636d0e257eda9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665106784; 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=az/J/DbmRg9TfrlSJWFASZGAb1OJpLPyv/KGqsHzdGE=; b=pYNbbh4+wW+uPp2NqoxmwRItBGJEYDPfGC9rBWn4ZRqUhmOKYy3xJs7SBAR/sBPSRGFWQ7 78kQK+9InQUy97nl5k9haSavC9e6Vk2h0nTYfLtmU/oSCroUktkbh41sYfHTdcGOan72UE FP/+S+7dTBFRydE8ig/GYVOr1XWl/QmppYkI5nVHUwpPT96aBSiv5ipW/mNJDnWJEsuaM+ hJFqHkSf8Jazdne+iCXbDMsZJbYy1G/n5BHu+1y5Vf0ki8+WU4xAdzf4rZf1/38DoizcVS Jjq8VTa+1yKiaJeT4LjE5AWa0fgvNuh+V7KS8zj78YHlVbWm+1gueRiI+mEyRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665106784; a=rsa-sha256; cv=none; b=OnDp6L9C185A11Hj6Q0ZUFhDoTqoa9fECbLYnvG8cGe6gMhuBNnUplsTQeQm4SEtS0+ATO dxiQ5y3htUR2x1rdZ72FYF8PAN7EcPtVfJmQ6bybWXrcyT1aMICZq8pFUmf1RmOxf0lhK1 W5UPExiOldf5So6fx2Z4K/o3Pgxi9/z+9QCTZkRoSQq+/c3vsJ50WejXd7ZZNwIjQpppiW uEKMpuKK+OQM6Go52V2GPXvTDLb9g5XPY5wS1tusR31098Am5u5ro/kbnri6t0U1kzw7o8 seJwvkfHT0NMyuo96W1a16dwf6o/l8bHg2no+c/4rIw39Yoo0qzj3B9yLtEXaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=02c646bb7288986912ad7bbe410636d0e257eda9 commit 02c646bb7288986912ad7bbe410636d0e257eda9 Author: Ed Maste AuthorDate: 2022-10-04 20:31:39 +0000 Commit: Ed Maste CommitDate: 2022-10-07 01:39:00 +0000 ssh-keygen: fix double free in error path From OpenSSH-portable commit 5062ad48814b, OpenBSD commit 39f35e16ba87. MFC after: 3 days (cherry picked from commit 666605ad2df3f5c1fb973dbd719ffbe3f3935c1d) --- 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; }