From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 201F92E8DEF for ; Mon, 4 May 2026 08:47:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777884421; cv=none; b=gEbnvocx7EnjH2fWB1c5r5sZD2EqIgYjNpzWuTGUCiA6zQLj/mZfzkir/SySJap/I0DcN+8qxXBDdEOdJs/QdB+FC7H+WRd2hQzKhaKxur+HgnkrqDOA5N6wom4a/sjSj3c+8aTfat+tmt+mIqqMz8TKtpU0Exb48/VoXMaSIpE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777884421; c=relaxed/simple; bh=9zmFkwg/eHgLM/xgVyb8yYJe3NmpdM5Cda8COEsJifg=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=oG7bWhHeBE+8GC5C3vhabvQre8yWs4Y1jZO/shWb+eIOotaaChmmEJJXYOZk1ZB2ofo3kaGB3MDUQoHZrBg+ZjYr7r4Dzti3y0k0LS11dsu6Cbw4W1E2cl7pze8zCP9e3Ye2b/nsZ7wt/s4KxKNIg+Zrsb+FUO6YJSH/Mvem3vw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Vc6nonex; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Vc6nonex" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AAE7EC2BCB9; Mon, 4 May 2026 08:47:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1777884421; bh=9zmFkwg/eHgLM/xgVyb8yYJe3NmpdM5Cda8COEsJifg=; h=Subject:To:Cc:From:Date:From; b=Vc6nonexCVDnx1+CGH97CGQjTaqe2awMmbt2A0b+n+dnk27NfLW3sugzYiXtWqEVI 1lbvwaAgq/TwIes9fiwhakusfPc8ureBlEpo4ErB6HYyDGHypSs+u8ccnCvxy47NWD 9v9df+sGkzQclWkE/iXtNYiVgLnwJM/p92FEFtmI= Subject: FAILED: patch "[PATCH] crypto: arm64/aes - Fix 32-bit aes_mac_update() arg treated" failed to apply to 5.10-stable tree To: ebiggers@kernel.org,ardb@kernel.org Cc: From: Date: Mon, 04 May 2026 10:46:58 +0200 Message-ID: <2026050458-boat-chant-b07f@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y git checkout FETCH_HEAD git cherry-pick -x f8f08d7cc43237e91e3aedf7b67d015d24c38fcc # git commit -s git send-email --to '' --in-reply-to '2026050458-boat-chant-b07f@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From f8f08d7cc43237e91e3aedf7b67d015d24c38fcc Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Wed, 18 Feb 2026 13:34:49 -0800 Subject: [PATCH] crypto: arm64/aes - Fix 32-bit aes_mac_update() arg treated as 64-bit Since the 'enc_after' argument to neon_aes_mac_update() and ce_aes_mac_update() has type 'int', it needs to be accessed using the corresponding 32-bit register, not the 64-bit register. The upper half of the corresponding 64-bit register may contain garbage. Fixes: 4860620da7e5 ("crypto: arm64/aes - add NEON/Crypto Extensions CBCMAC/CMAC/XCBC driver") Cc: stable@vger.kernel.org Reviewed-by: Ard Biesheuvel Link: https://lore.kernel.org/r/20260218213501.136844-4-ebiggers@kernel.org Signed-off-by: Eric Biggers diff --git a/arch/arm64/crypto/aes-modes.S b/arch/arm64/crypto/aes-modes.S index 0e834a2c062c..e793478f37c1 100644 --- a/arch/arm64/crypto/aes-modes.S +++ b/arch/arm64/crypto/aes-modes.S @@ -838,7 +838,7 @@ AES_FUNC_START(aes_mac_update) encrypt_block v0, w2, x1, x7, w8 eor v0.16b, v0.16b, v4.16b cmp w3, wzr - csinv x5, x6, xzr, eq + csinv w5, w6, wzr, eq cbz w5, .Lmacout encrypt_block v0, w2, x1, x7, w8 st1 {v0.16b}, [x4] /* return dg */ @@ -852,7 +852,7 @@ AES_FUNC_START(aes_mac_update) eor v0.16b, v0.16b, v1.16b /* ..and xor with dg */ subs w3, w3, #1 - csinv x5, x6, xzr, eq + csinv w5, w6, wzr, eq cbz w5, .Lmacout .Lmacenc: