net: ipv4: stop checking crypto_ahash_alignmask

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 <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c
index bc0f968c5d5b4839ca333e572440e1a0b334b490..a2e6e1fdf82be44c15daefa2a423967ccd8999f7 100644 (file)
--- 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(void *data, 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(void *data, 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;