From nobody Tue Nov 23 14:34:38 2021 X-Original-To: dev-commits-src-branches@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 96AB518A0A57; Tue, 23 Nov 2021 14:34:39 +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 4Hz69C1vNFz4cb8; Tue, 23 Nov 2021 14:34:39 +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 182D2181EA; Tue, 23 Nov 2021 14:34:39 +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 1ANEYcff039322; Tue, 23 Nov 2021 14:34:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ANEYcVm039321; Tue, 23 Nov 2021 14:34:38 GMT (envelope-from git) Date: Tue, 23 Nov 2021 14:34:38 GMT Message-Id: <202111231434.1ANEYcVm039321@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: 83d0a7763a92 - stable/12 - aesni: Avoid a potential out-of-bounds load in AES_GCM_encrypt() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/12 X-Git-Reftype: branch X-Git-Commit: 83d0a7763a92b893875548812d2a3aea651e971f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637678079; 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=iCWjERb+Dr+mPO7U3L2EcGUj5oOhjVrwlWmcdv4lVek=; b=Co9VwF51Izm0gxqhBsymbQkoLvzD/LONxqmPUNtcdpRceuXYPKRmVgg9RKP+BtNvak3SOi Rv+oZmqebwTi9g/FH0PGnrNUcs/OXzFZxB/hAXKAxBIJ7jwh1snBYpi8/jjwdxEUqg6hj3 BCsbIoyaE8BRVTDd7jb/4y1O5hdCerLKYDBd3SmlhN2Csdkl6e4W4sTQaMmPy5yJ50NUtY e6SkYwIDc09T6ew/N5FDunbNLQcBzQJpxWdlI07C2D6NfQd5irCTkqLPFY71PdLXoObDa9 kAy9mJ3Sx2bhHf0H3F5GuANU9+NG5jZs7uuwpCBZb96pG6NESIth0019+oEyfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637678079; a=rsa-sha256; cv=none; b=tnDtDhnymLXkCDyIsQx0xkdZMn9Bg+pUjL4kdksa3H+v5bhtOA7oFncbpuGI8yjnUimTjb xpivd2mp/0MHxy4iiyqEHnk5nWDNwVzU06FkgbOz2sXmKasMvMFbRq7DcabKK4S3ejPorS UHqhga1wy4Gr6vhuePc2rYZHCpSNxsIZlZlN0GQ8Ayq2dlgq+P3IXcW3b3aONa+oOZKQhJ tjBq7tqT8M6x3fATWR/CeP8BAxEaThxuaBt/YvMi+Zt96HOl9h7HeWqFj7PqI/t2G7yMVN Pc2XaW6/s9olUVekcJTUqzgCKS1AZcLNIRygXTw6iDcEEFF0kjds8xcwQcOJTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=83d0a7763a92b893875548812d2a3aea651e971f commit 83d0a7763a92b893875548812d2a3aea651e971f Author: Mark Johnston AuthorDate: 2021-11-16 14:16:16 +0000 Commit: Mark Johnston CommitDate: 2021-11-23 14:33:38 +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