aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crypto/asymmetric_keys/pkcs7_verify.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/crypto/asymmetric_keys/pkcs7_verify.c b/crypto/asymmetric_keys/pkcs7_verify.c
index d20c0b4b880e..325575caf6b4 100644
--- a/crypto/asymmetric_keys/pkcs7_verify.c
+++ b/crypto/asymmetric_keys/pkcs7_verify.c
@@ -49,11 +49,12 @@ static int pkcs7_digest(struct pkcs7_message *pkcs7,
49 sinfo->sig.digest_size = digest_size = crypto_shash_digestsize(tfm); 49 sinfo->sig.digest_size = digest_size = crypto_shash_digestsize(tfm);
50 50
51 ret = -ENOMEM; 51 ret = -ENOMEM;
52 digest = kzalloc(digest_size + desc_size, GFP_KERNEL); 52 digest = kzalloc(ALIGN(digest_size, __alignof__(*desc)) + desc_size,
53 GFP_KERNEL);
53 if (!digest) 54 if (!digest)
54 goto error_no_desc; 55 goto error_no_desc;
55 56
56 desc = digest + digest_size; 57 desc = PTR_ALIGN(digest + digest_size, __alignof__(*desc));
57 desc->tfm = tfm; 58 desc->tfm = tfm;
58 desc->flags = CRYPTO_TFM_REQ_MAY_SLEEP; 59 desc->flags = CRYPTO_TFM_REQ_MAY_SLEEP;
59 60