diff options
| author |   Sowmini Varadhan <sowmini.varadhan@oracle.com> | 2015-10-19 17:23:28 -0400 |
|---|---|---|
| committer |   Herbert Xu <herbert@gondor.apana.org.au> | 2015-10-20 22:14:01 +0800 |
| commit | 271817a3e92c0455bda5856d87eca244ad67d3a2 (patch) | |
| tree | 6fe9c083b7ba5ba16a2f020ebe2ac69436fe8f63 /crypto | |
| parent | crypto: akcipher - Don't #include crypto/public_key.h as the contents aren't used (diff) | |
| download | linux-dev-271817a3e92c0455bda5856d87eca244ad67d3a2.tar.xz linux-dev-271817a3e92c0455bda5856d87eca244ad67d3a2.zip | |
crypto: asymmetric_keys - Fix unaligned access in x509_get_sig_params()
x509_get_sig_params() has the same code pattern as the one in
pkcs7_verify() that is fixed by commit 62f57d05e287 ("crypto: pkcs7 - Fix
unaligned access in pkcs7_verify()") so apply a similar fix here: make
sure that desc is pointing at an algined value past the digest_size,
and take alignment values into consideration when doing kzalloc()
Signed-off-by: Sowmini Varadhan <sowmini.varadhan@oracle.com>
Acked-by: David Howells <dhowells@redhat.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/asymmetric_keys/x509_public_key.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crypto/asymmetric_keys/x509_public_key.c b/crypto/asymmetric_keys/x509_public_key.c index 6d88dd15c98d..6451d1848a7d 100644 --- a/crypto/asymmetric_keys/x509_public_key.c +++ b/crypto/asymmetric_keys/x509_public_key.c @@ -194,14 +194,15 @@ int x509_get_sig_params(struct x509_certificate *cert) * digest storage space. */ ret = -ENOMEM; - digest = kzalloc(digest_size + desc_size, GFP_KERNEL); + digest = kzalloc(ALIGN(digest_size, __alignof__(*desc)) + desc_size, + GFP_KERNEL); if (!digest) goto error; cert->sig.digest = digest; cert->sig.digest_size = digest_size; - desc = digest + digest_size; + desc = PTR_ALIGN(digest + digest_size, __alignof__(*desc)); desc->tfm = tfm; desc->flags = CRYPTO_TFM_REQ_MAY_SLEEP; |