Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 271817a3 authored by Sowmini Varadhan's avatar Sowmini Varadhan Committed by Herbert Xu
Browse files

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 62f57d05 ("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: default avatarSowmini Varadhan <sowmini.varadhan@oracle.com>
Acked-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 381ceef7

crypto/asymmetric_keys/x509_public_key.c

+3 −2
Original line number Diff line number Diff line
@@ -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;