From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Thu, 28 May 2015 14:07:56 +0000 (+0800)
Subject: crypto: api - Include alignment in crypto_alg_extsize
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c2110f28341cec2ecfd9474db15ac090bce1234c;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

crypto: api - Include alignment in crypto_alg_extsize

This patch ensures that the tfm context always has enough extra
memory to ensure that it is aligned according to cra_alignment.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
---

diff --git a/crypto/algapi.c b/crypto/algapi.c
index abf100c054e0..3c079b7f23f6 100644
--- a/crypto/algapi.c
+++ b/crypto/algapi.c
@@ -980,7 +980,8 @@ EXPORT_SYMBOL_GPL(crypto_xor);
 
 unsigned int crypto_alg_extsize(struct crypto_alg *alg)
 {
-	return alg->cra_ctxsize;
+	return alg->cra_ctxsize +
+	       (alg->cra_alignmask & ~(crypto_tfm_ctx_alignment() - 1));
 }
 EXPORT_SYMBOL_GPL(crypto_alg_extsize);