From nobody Tue Nov 23 14:32:57 2021 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 C4852189F385; Tue, 23 Nov 2021 14:32:57 +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 4Hz67F3LH6z4bfJ; Tue, 23 Nov 2021 14:32:57 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 5261218352; Tue, 23 Nov 2021 14:32:57 +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 1ANEWv43039009; Tue, 23 Nov 2021 14:32:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ANEWvv2039008; Tue, 23 Nov 2021 14:32:57 GMT (envelope-from git) Date: Tue, 23 Nov 2021 14:32:57 GMT Message-Id: <202111231432.1ANEWvv2039008@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 8c29b0eeb0ce - stable/13 - aesni: Avoid a potential out-of-bounds load in AES_GCM_encrypt() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8c29b0eeb0ce4b7e6df524004d5edfbb6146e35b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637677977; 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=zs3jNvqu3cip+f0COhZ9/m7lgx0FRCEhce/CzzpewMA=; b=WwtCdazZwwg7Sq1K4bT284ejPxTl5q5thJsWvQ1yAE30fwjjj6/KnQvvsXiXg1wXFNoV4j PdOnDycFxvpT52p8rCf5glvCRghffa3NmlPfO6v7vTQR1kbyXSIqzF/O48VQbbYUlp11kW CYurM12pL6+2obP34yEWbUu97nxUjmcDpRc7i0IjMZi6uko4U1vBwu4fpCovXvqIT1twV9 bRHO3rj8V0vUZQ6bIrSBSGeIwqNXEqpkRdwuvJDEfR+LnZduV4YBtlSDP1BXlznEWhfzGL 3sD2wDy4PuUHYoguNkD92SB4za0stlIYRN+EVR4SLIb4zrBMLZILVRLL+Tw5dg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637677977; a=rsa-sha256; cv=none; b=cNe1FP7+uRoyHZcIWHV53pEGSneIzwMpiZOjVDlftTYzGpFgF7MZe3b4RFhlegplj4oouH 6R3+DBmlw/iDWRqiTTEJGUdbMWYM7Y5h6lOyPpSLEgaBAIEsYnXSD0uVcAbSklSN/0qpu4 2bY3+lBUE1p95uR71c5yGyAmXaBexVJfHiVBmV5Ks5M2udovISYDxgEqqnoPq6H646Iq1d q+mPRpXYtj2vErTgJRKgp5QzgAdc4TK1SUmtSF70rYC0pKkGsXOOuMj7wfD0MBYUrT3v8i aINQMhArrLAk9hkZ6cwHcuyj1QOlLi50ig8zHOOcZCxlNmtNQCnJRCkKbVBuSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8c29b0eeb0ce4b7e6df524004d5edfbb6146e35b commit 8c29b0eeb0ce4b7e6df524004d5edfbb6146e35b Author: Mark Johnston AuthorDate: 2021-11-16 14:16:16 +0000 Commit: Mark Johnston CommitDate: 2021-11-23 14:32:33 +0000 aesni: Avoid a potential out-of-bounds load in AES_GCM_encrypt() Reported by: Jenkins (KASAN job) Reviewed by: cem, jhb Sponsored by: The FreeBSD Foundation (cherry picked from commit 4285655adb7480336857bf8e051365d73db18011) --- sys/crypto/aesni/aesni_ghash.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/crypto/aesni/aesni_ghash.c b/sys/crypto/aesni/aesni_ghash.c index b0d1b6137ec6..a1295b6ccbda 100644 --- a/sys/crypto/aesni/aesni_ghash.c +++ b/sys/crypto/aesni/aesni_ghash.c @@ -504,9 +504,10 @@ AES_GCM_encrypt(const unsigned char *in, unsigned char *out, } tmp1 = _mm_aesenc_si128(tmp1, KEY[nr-1]); tmp1 = _mm_aesenclast_si128(tmp1, KEY[nr]); - tmp1 = _mm_xor_si128(tmp1, - _mm_loadu_si128(&((const __m128i *)in)[k])); - last_block = tmp1; + last_block = _mm_setzero_si128(); + memcpy(&last_block, &((const __m128i *)in)[k], + nbytes % 16); + last_block = _mm_xor_si128(last_block, tmp1); for (j=0; j