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 32285477E28 for ; Wed, 13 May 2026 16:52:57 +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=1778691178; cv=none; b=k1YOl8/OkCZsGdrrA9TzvZA1ISylG3conGpfvtEOUJAioxsim80+9i+TlFZnMFfVahFOlhqhZb6/dKFRs7r9sXWLb0Lp05MrXVn5SqAtE4rOxB28OOkapn8Hn0roon1I8z4dSKJ6FjIBVk8pBuQTPlftMP6bi1nzkeUqFDKLas0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778691178; c=relaxed/simple; bh=EFkuAh1bOq735j0n4hinCZCq3tEHy4MHBpZ0GB0UJ2U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=n4n/Pcp4+8XuXKb3m7/nM2j/25/dVY11qYM11rn39f5vRDAJ6aT0A/twJh6dN1YjBeXDkJHbx+2JKHJfno+hQxk5Lr7sFKjdxlKi6oliCS9RswhUjUOZaH7V2odZb1TZ0F5o2bIbb58Cvpl3ji9QTBYDlFZb72xoCVeRvyFdeJ4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=jv999eyb; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="jv999eyb" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4080CC19425; Wed, 13 May 2026 16:52:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778691177; bh=EFkuAh1bOq735j0n4hinCZCq3tEHy4MHBpZ0GB0UJ2U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jv999eybwjZj3G0sQ78s7QaoVoHDoAb1ao9O5SiWc4UugMadbfJjJzsiEF8qR1ULW aEw118YbLZJnIJ7UuujAU9ffgdyc7PrmYz4iGs+pI75ytyY0zSkOTIxeBxt+qt9pT3 Ds7RpZHT9fwrH3N53slGZa2hxHmrkQvqeOYrPN5NZ+obmRne5oSpfWeKQ5ej7YmC1O J5Hslu9TmanOWbpfcAIvjlfFdnSb+psOQmja9QbGu1RgYspKNRDSKl0maaYaBDEuyj cXcQV6iP71UVTC6wBo0VPR1tMSSV72e5Pvl6VzyfGeXetzIC0kAkTNAZdn6rw7+s1G RHy77JmH2qeeg== From: Sasha Levin To: stable@vger.kernel.org Cc: Eric Biggers , Herbert Xu , Sasha Levin Subject: [PATCH 6.1.y 1/3] net: ipv4: stop checking crypto_ahash_alignmask Date: Wed, 13 May 2026 12:52:53 -0400 Message-ID: <20260513165255.3822003-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026051235-gigolo-wriggle-f7a3@gregkh> References: <2026051235-gigolo-wriggle-f7a3@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Eric Biggers [ Upstream commit e77f5dd701381cef35b9ea8b6dea6e62c8a7f9f3 ] Now that the alignmask for ahash and shash algorithms is always 0, crypto_ahash_alignmask() always returns 0 and will be removed. In preparation for this, stop checking crypto_ahash_alignmask() in ah4.c. Signed-off-by: Eric Biggers Signed-off-by: Herbert Xu Stable-dep-of: ec54093e6a8f ("xfrm: ah: account for ESN high bits in async callbacks") Signed-off-by: Sasha Levin --- net/ipv4/ah4.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c index ee4e578c7f201..c64e3212581bc 100644 --- a/net/ipv4/ah4.c +++ b/net/ipv4/ah4.c @@ -27,9 +27,7 @@ static void *ah_alloc_tmp(struct crypto_ahash *ahash, int nfrags, { unsigned int len; - len = size + crypto_ahash_digestsize(ahash) + - (crypto_ahash_alignmask(ahash) & - ~(crypto_tfm_ctx_alignment() - 1)); + len = size + crypto_ahash_digestsize(ahash); len = ALIGN(len, crypto_tfm_ctx_alignment()); @@ -46,10 +44,9 @@ static inline u8 *ah_tmp_auth(void *tmp, unsigned int offset) return tmp + offset; } -static inline u8 *ah_tmp_icv(struct crypto_ahash *ahash, void *tmp, - unsigned int offset) +static inline u8 *ah_tmp_icv(void *tmp, unsigned int offset) { - return PTR_ALIGN((u8 *)tmp + offset, crypto_ahash_alignmask(ahash) + 1); + return tmp + offset; } static inline struct ahash_request *ah_tmp_req(struct crypto_ahash *ahash, @@ -129,7 +126,7 @@ static void ah_output_done(struct crypto_async_request *base, int err) int ihl = ip_hdrlen(skb); iph = AH_SKB_CB(skb)->tmp; - icv = ah_tmp_icv(ahp->ahash, iph, ihl); + icv = ah_tmp_icv(iph, ihl); memcpy(ah->auth_data, icv, ahp->icv_trunc_len); top_iph->tos = iph->tos; @@ -182,7 +179,7 @@ static int ah_output(struct xfrm_state *x, struct sk_buff *skb) if (!iph) goto out; seqhi = (__be32 *)((char *)iph + ihl); - icv = ah_tmp_icv(ahash, seqhi, seqhi_len); + icv = ah_tmp_icv(seqhi, seqhi_len); req = ah_tmp_req(ahash, icv); sg = ah_req_sg(ahash, req); seqhisg = sg + nfrags; @@ -279,7 +276,7 @@ static void ah_input_done(struct crypto_async_request *base, int err) work_iph = AH_SKB_CB(skb)->tmp; auth_data = ah_tmp_auth(work_iph, ihl); - icv = ah_tmp_icv(ahp->ahash, auth_data, ahp->icv_trunc_len); + icv = ah_tmp_icv(auth_data, ahp->icv_trunc_len); err = crypto_memneq(icv, auth_data, ahp->icv_trunc_len) ? -EBADMSG : 0; if (err) @@ -374,7 +371,7 @@ static int ah_input(struct xfrm_state *x, struct sk_buff *skb) seqhi = (__be32 *)((char *)work_iph + ihl); auth_data = ah_tmp_auth(seqhi, seqhi_len); - icv = ah_tmp_icv(ahash, auth_data, ahp->icv_trunc_len); + icv = ah_tmp_icv(auth_data, ahp->icv_trunc_len); req = ah_tmp_req(ahash, icv); sg = ah_req_sg(ahash, req); seqhisg = sg + nfrags; -- 2.53.0