From nobody Thu Aug 24 13:41:07 2023 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 4RWkkX18KJz4rBDg; Thu, 24 Aug 2023 13:41:08 +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 4RWkkX0dPhz3fmN; Thu, 24 Aug 2023 13:41:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692884468; 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=pPxHYPAwoc3LCcnHOQaAkb/eMVF+q8OxBGFoXD+Z0l8=; b=u0C9/YbveVV1z9UrA7sCQEvd3KBeWBbNR8WmfVrDu888hNwjQSGOhjb2EDPJzK099AYNWN LkIdZ3hmGzOi0g79f+jkwgemFXMkfYrz7wuj5bXZ9znLcW6imbjzbUqE2rg8vkLXaLfWSp VHpdTHWETMIGh9brb8M/Sga+ffg3aq4DGDRy40oob378aM/HaCAiU2URq0AwbjaL0ZjH8L 7X9k9FrD2vPvt80fWkOZcGMBK0SESDEg0qfmLe+6OpWnEhaJMDyZXQ6itf2qs2RvYKYVE1 ZvW/Df9wSeQJTK3EScOQjTiMZFBFAQxFLF46PkZPEBz7vI4XbSuAthrF0HPARQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692884468; 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=pPxHYPAwoc3LCcnHOQaAkb/eMVF+q8OxBGFoXD+Z0l8=; b=rOcJ8l96HDVWZUdXZRKUTiDpZHfGscQQ53C4Cu8WVdAGbcnncTxe56aQqBenlCQHQz2bkT OD02iubGxM/dzB0+wr6il6I5+Imzk/xATGW+7NBrENnW6JMPHq8ww+VgqUTEA2iG3Ql6lk t875i4I9BRvtILHo4ogHqp8WKLA1EyIf5SBmEQClOnEKGbA8aVcnb6uhmFzQvjamAKNJTa SIOKxF3wDuUGkwmfLCdbWC5Jd4u3RGAn7+ZxdEZ02/Oz3G03F2s61w/T6A+2R+bF26/qI6 xsw3jZcFq/ndIJMlgi8BIvuTlC3wujrW4Q1gvHPaThMRw78WJOPg5V+ik7zaqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692884468; a=rsa-sha256; cv=none; b=SDSe3cgQDkRCrXDaWEk2ClCjcmDtjRVZhHrxrLnGLPVPA+CqwsS/zS7Nc6Y7J9SdpiLzK5 gn7D85ZL6pLGwt/5QxJUQKK9WX8L4X9umaV1a/R3QkcBxZF1jEL7bX0D5vVWbSOScv1o5d JJLtd5b6TIEZZ3Fe2/k0H3vcW9ddhPrs0xqdyXm3WTGI0o764YpZfXAxZ0T/I+O+fhtAWK +97b2UzArQb6VmMCuRjQdAohilfM9OgtgsBDegiRD+fcSlU3ENVf3VONvfndV5L6+tp1FO XGZ2Mh/4rnifNXY9Ff0G5kMthpYJ9HxFjGrwYh07mmYTwQPZlra7BZq34IOleg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RWkkW6qHXzTdK; Thu, 24 Aug 2023 13:41:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37ODf7uM023574; Thu, 24 Aug 2023 13:41:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37ODf7OT023571; Thu, 24 Aug 2023 13:41:07 GMT (envelope-from git) Date: Thu, 24 Aug 2023 13:41:07 GMT Message-Id: <202308241341.37ODf7OT023571@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: 045fc75ce490 - stable/13 - opencrypto: Respect alignment constraints in xor_and_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/13 X-Git-Reftype: branch X-Git-Commit: 045fc75ce490cca0aec8f412dd28bc1031e0919d Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=045fc75ce490cca0aec8f412dd28bc1031e0919d commit 045fc75ce490cca0aec8f412dd28bc1031e0919d Author: Mark Johnston AuthorDate: 2023-07-27 19:44:52 +0000 Commit: Mark Johnston CommitDate: 2023-08-24 13:32:59 +0000 opencrypto: Respect alignment constraints in xor_and_encrypt() Copy operands to an aligned buffer before performing operations which require alignment. Otherwise it's possible for this code to trigger an alignment fault on armv7. Reviewed by: jhb MFC after: 2 weeks Sponsored by: Klara, Inc. Sponsored by: Stormshield Differential Revision: https://reviews.freebsd.org/D41211 (cherry picked from commit 96c2538121390c872f68ac48f97b35fb973c11dc) --- sys/opencrypto/cbc_mac.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/sys/opencrypto/cbc_mac.c b/sys/opencrypto/cbc_mac.c index ed31dd946e48..ed9230beaf49 100644 --- a/sys/opencrypto/cbc_mac.c +++ b/sys/opencrypto/cbc_mac.c @@ -38,19 +38,16 @@ static void xor_and_encrypt(struct aes_cbc_mac_ctx *ctx, const uint8_t *src, uint8_t *dst) { - const uint64_t *b1; - uint64_t *b2; - uint64_t temp_block[CCM_CBC_BLOCK_LEN/sizeof(uint64_t)]; +#define NWORDS (CCM_CBC_BLOCK_LEN / sizeof(uint64_t)) + uint64_t b1[NWORDS], b2[NWORDS], temp[NWORDS]; - b1 = (const uint64_t*)src; - b2 = (uint64_t*)dst; + memcpy(b1, src, CCM_CBC_BLOCK_LEN); + memcpy(b2, dst, CCM_CBC_BLOCK_LEN); - for (size_t count = 0; - count < CCM_CBC_BLOCK_LEN/sizeof(uint64_t); - count++) { - temp_block[count] = b1[count] ^ b2[count]; - } - rijndaelEncrypt(ctx->keysched, ctx->rounds, (void*)temp_block, dst); + for (size_t count = 0; count < NWORDS; count++) + temp[count] = b1[count] ^ b2[count]; + rijndaelEncrypt(ctx->keysched, ctx->rounds, (void *)temp, dst); +#undef NWORDS } void