crypto: ccm - Use crypto_aead_set_reqsize helper

This patch uses the crypto_aead_set_reqsize helper to avoid directly
touching the internals of aead.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
(cherry picked from commit 2c221ad39424cf8c72abe42a7f989a8d38d181d2)

Orabug: 24614549

Signed-off-by: Ethan Zhao <ethan.zhao@oracle.com>
Signed-off-by: Dhaval Giani <dhaval.giani@oracle.com>

diff --git a/crypto/ccm.c b/crypto/ccm.c
index 003bbbd21a2ba9a24f4207f20037d5ee75593726..a4d1a5eda18b4e9758ec899fdf48c6f1359a8c14 100644 (file)
--- a/crypto/ccm.c
+++ b/crypto/ccm.c
@@ -453,9 +453,9 @@ static int crypto_ccm_init_tfm(struct crypto_tfm *tfm)
 
        align = crypto_tfm_alg_alignmask(tfm);
        align &= ~(crypto_tfm_ctx_alignment() - 1);
-       tfm->crt_aead.reqsize = align +
-                               sizeof(struct crypto_ccm_req_priv_ctx) +
-                               crypto_ablkcipher_reqsize(ctr);
+       crypto_aead_set_reqsize(__crypto_aead_cast(tfm),
+               align + sizeof(struct crypto_ccm_req_priv_ctx) +
+               crypto_ablkcipher_reqsize(ctr));
 
        return 0;
 
@@ -729,10 +729,10 @@ static int crypto_rfc4309_init_tfm(struct crypto_tfm *tfm)
 
        align = crypto_aead_alignmask(aead);
        align &= ~(crypto_tfm_ctx_alignment() - 1);
-       tfm->crt_aead.reqsize = sizeof(struct aead_request) +
-                               ALIGN(crypto_aead_reqsize(aead),
-                                     crypto_tfm_ctx_alignment()) +
-                               align + 16;
+       crypto_aead_set_reqsize(__crypto_aead_cast(tfm),
+               sizeof(struct aead_request) +
+               ALIGN(crypto_aead_reqsize(aead), crypto_tfm_ctx_alignment()) +
+               align + 16);
 
        return 0;
 }