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 AAC41477E28 for ; Wed, 13 May 2026 16:52:58 +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=n1IuQUh7kWD2Ev0axiaYoLqdPBUQg30wLbvsM5oj2Vojrp0ndq8Y0pD7MC4UXGFZj4v0AitCvYJa+HTDRTS2l6jBDW9tMYAOHbD8jXtoD5K2/WtCjrchUl4KSLdY1z5cJlkTRc1dRfYfJr7meOetXDqn7eW09x2oroRapJ972Mc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778691178; c=relaxed/simple; bh=uj38gRY/0U1XABoL4kehi+Kvf+XSUvW9AjTKJ9HHMFc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eX7KQH2Nmf7wTDidD1ADCre9PGvW9f2TGRK0IlHGdtginsneUoN7JHMGnV8WoTUZwqWHDtkVI6K4ohAeIu2IsbXxwGWl2ZUVV5NDXdlfTC4g1ZKfxqYlPNSYWJFSwPomDV0AdU6EZTIzK6iiqhZZ6SIDPkYI24Ux5mTzoHBrjd4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=VIddkRoS; 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="VIddkRoS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0D095C2BCC6; 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=1778691178; bh=uj38gRY/0U1XABoL4kehi+Kvf+XSUvW9AjTKJ9HHMFc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VIddkRoSaLDMXYt454nhQUZ7EMP4hhnne50oOBDWrxUNiHb9HD92wzuvdn50SS1fv 18ihg4pcBjZJ/fmJG8spgmgEGRAzWc6s6kDlnmfNV6c++HZBuR9Vebgm5hOCj07xyY cmkLL030u5GxdKKRTfTk9L8aRqZc5iCpfdD+kHkznDejjyb+5WnE+RdB40PWswgJ5Z 2M0fmD6OYpFwhT25MLDFdnamvOj6ocUCKbKLIxe/q8+yYMIV+vSCGY7zuQHCAeLbpU VIoTS/l+nnsfcH9L276fOMmFud2UB4dQY1tGVTwF4C3/AiygCrkOyPzFR0a1i/9FzN v8+5LgmUzvDag== From: Sasha Levin To: stable@vger.kernel.org Cc: Eric Biggers , Herbert Xu , Sasha Levin Subject: [PATCH 6.1.y 2/3] net: ipv6: stop checking crypto_ahash_alignmask Date: Wed, 13 May 2026 12:52:54 -0400 Message-ID: <20260513165255.3822003-2-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260513165255.3822003-1-sashal@kernel.org> References: <2026051235-gigolo-wriggle-f7a3@gregkh> <20260513165255.3822003-1-sashal@kernel.org> 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 0a6bfaa0e695facb072f2fedfb55df37c4483b50 ] 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 ah6.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/ipv6/ah6.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c index 151d8d98d0463..68896e7828b6d 100644 --- a/net/ipv6/ah6.c +++ b/net/ipv6/ah6.c @@ -79,9 +79,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()); @@ -103,10 +101,9 @@ static inline u8 *ah_tmp_auth(u8 *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, @@ -327,7 +324,7 @@ static void ah6_output_done(struct crypto_async_request *base, int err) iph_base = AH_SKB_CB(skb)->tmp; iph_ext = ah_tmp_ext(iph_base); - icv = ah_tmp_icv(ahp->ahash, iph_ext, extlen); + icv = ah_tmp_icv(iph_ext, extlen); memcpy(ah->auth_data, icv, ahp->icv_trunc_len); memcpy(top_iph, iph_base, IPV6HDR_BASELEN); @@ -384,7 +381,7 @@ static int ah6_output(struct xfrm_state *x, struct sk_buff *skb) iph_ext = ah_tmp_ext(iph_base); seqhi = (__be32 *)((char *)iph_ext + extlen); - 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; @@ -480,7 +477,7 @@ static void ah6_input_done(struct crypto_async_request *base, int err) work_iph = AH_SKB_CB(skb)->tmp; auth_data = ah_tmp_auth(work_iph, hdr_len); - 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) @@ -588,7 +585,7 @@ static int ah6_input(struct xfrm_state *x, struct sk_buff *skb) auth_data = ah_tmp_auth((u8 *)work_iph, hdr_len); seqhi = (__be32 *)(auth_data + ahp->icv_trunc_len); - 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; -- 2.53.0