From: Herbert Xu Date: Mon, 11 May 2015 09:48:04 +0000 (+0800) Subject: crypto: aesni - Use crypto_aead_set_reqsize helper X-Git-Tag: v4.1.12-92~24^2~89 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=44d71ac79cd0aa2c3aa1b5e2f2e412baf48b3f22;p=users%2Fjedix%2Flinux-maple.git crypto: aesni - 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 (cherry picked from commit a5a2b4da012d3ed92476b169a66e17507abe1a48) Orabug: 24614549 Signed-off-by: Ethan Zhao Signed-off-by: Dhaval Giani --- diff --git a/arch/x86/crypto/aesni-intel_glue.c b/arch/x86/crypto/aesni-intel_glue.c index 112cefacf2af0..2ade240002460 100644 --- a/arch/x86/crypto/aesni-intel_glue.c +++ b/arch/x86/crypto/aesni-intel_glue.c @@ -807,8 +807,9 @@ static int rfc4106_init(struct crypto_tfm *tfm) child_ctx = aesni_rfc4106_gcm_ctx_get(cryptd_child); memcpy(child_ctx, ctx, sizeof(*ctx)); ctx->cryptd_tfm = cryptd_tfm; - tfm->crt_aead.reqsize = sizeof(struct aead_request) - + crypto_aead_reqsize(&cryptd_tfm->base); + crypto_aead_set_reqsize(__crypto_aead_cast(tfm), + sizeof(struct aead_request) + + crypto_aead_reqsize(&cryptd_tfm->base)); return 0; }