From owner-svn-src-head@freebsd.org Thu Jun 25 20:21:35 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3A911344769; Thu, 25 Jun 2020 20:21:35 +0000 (UTC) (envelope-from jhb@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49tBHg0v55z4Y9S; Thu, 25 Jun 2020 20:21:35 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1A1AE8D36; Thu, 25 Jun 2020 20:21:35 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05PKLYJO004476; Thu, 25 Jun 2020 20:21:34 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05PKLYKF004475; Thu, 25 Jun 2020 20:21:34 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <202006252021.05PKLYKF004475@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Thu, 25 Jun 2020 20:21:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r362627 - head/sys/dev/glxsb X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/sys/dev/glxsb X-SVN-Commit-Revision: 362627 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2020 20:21:35 -0000 Author: jhb Date: Thu Jun 25 20:21:34 2020 New Revision: 362627 URL: https://svnweb.freebsd.org/changeset/base/362627 Log: Explicitly zero hash results and context in glxsb_authcompute(). Reviewed by: delphij Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D25438 Modified: head/sys/dev/glxsb/glxsb_hash.c Modified: head/sys/dev/glxsb/glxsb_hash.c ============================================================================== --- head/sys/dev/glxsb/glxsb_hash.c Thu Jun 25 20:20:22 2020 (r362626) +++ head/sys/dev/glxsb/glxsb_hash.c Thu Jun 25 20:21:34 2020 (r362627) @@ -65,7 +65,7 @@ glxsb_hash_key_setup(struct glxsb_session *ses, const static int glxsb_authcompute(struct glxsb_session *ses, struct cryptop *crp) { - u_char hash[HASH_MAX_LEN], hash2[HASH_MAX_LEN]; + u_char hash[HASH_MAX_LEN]; struct auth_hash *axf; union authctx ctx; int error; @@ -86,17 +86,22 @@ glxsb_authcompute(struct glxsb_session *ses, struct cr bcopy(ses->ses_octx, &ctx, axf->ctxsize); axf->Update(&ctx, hash, axf->hashsize); axf->Final(hash, &ctx); + explicit_bzero(&ctx, sizeof(ctx)); /* Verify or inject the authentication data */ if (crp->crp_op & CRYPTO_OP_VERIFY_DIGEST) { + u_char hash2[HASH_MAX_LEN]; + crypto_copydata(crp, crp->crp_digest_start, ses->ses_mlen, hash2); if (timingsafe_bcmp(hash, hash2, ses->ses_mlen) != 0) - return (EBADMSG); + error = EBADMSG; + explicit_bzero(hash2, sizeof(hash2)); } else crypto_copyback(crp, crp->crp_digest_start, ses->ses_mlen, hash); - return (0); + explicit_bzero(hash, sizeof(hash)); + return (error); } int