leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

crypto: asymmetric_keys - Fix unaligned access in x509_get_sig_params()

Browse Source 
x509_get_sig_params() has the same code pattern as the one in
pkcs7_verify() that is fixed by commit 62f57d05e2 ("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>
This commit is contained in:
Sowmini Varadhan 2015-10-19 17:23:28 -04:00 committed by Herbert Xu
parent 381ceef785
commit 271817a3e9
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crypto/asymmetric_keys/x509_public_key.c
View File

@ -194,14 +194,15 @@ int x509_get_sig_params(struct x509_certificate *cert)
* digest storage space. * digest storage space.
*/ */
ret = -ENOMEM; ret = -ENOMEM;
digest = kzalloc(digest_size + desc_size, GFP_KERNEL); digest = kzalloc(ALIGN(digest_size, __alignof__(*desc)) + desc_size,
GFP_KERNEL);
if (!digest) if (!digest)
goto error; goto error;
cert->sig.digest = digest; cert->sig.digest = digest;
cert->sig.digest_size = digest_size; cert->sig.digest_size = digest_size;
desc = digest + digest_size; desc = PTR_ALIGN(digest + digest_size, __alignof__(*desc));
desc->tfm = tfm; desc->tfm = tfm;
desc->flags = CRYPTO_TFM_REQ_MAY_SLEEP; desc->flags = CRYPTO_TFM_REQ_MAY_SLEEP;