Commit 1cfb4605 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'v6.12-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 

Pull crypto fixes from Herbert Xu:

 - Disable buggy p10 aes-gcm code on powerpc

 - Fix module aliases in paes_s390

 - Fix buffer overread in caam

* tag 'v6.12-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: powerpc/p10-aes-gcm - Disable CRYPTO_AES_GCM_P10
  crypto: s390/paes - Fix module aliases
  crypto: caam - Pad SG length when allocating hash edesc
parents e1b061b4 44ac4625

arch/powerpc/crypto/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ config CRYPTO_AES_PPC_SPE 


config CRYPTO_AES_GCM_P10

	tristate "Stitched AES/GCM acceleration support on P10 or later CPU (PPC)"

	depends on BROKEN

	depends on PPC64 && CPU_LITTLE_ENDIAN && VSX

	select CRYPTO_LIB_AES

	select CRYPTO_ALGAPI

arch/s390/crypto/paes_s390.c

+4 −1
Original line number Diff line number Diff line
@@ -802,7 +802,10 @@ static int __init paes_s390_init(void) 
module_init(paes_s390_init);

module_exit(paes_s390_fini);



MODULE_ALIAS_CRYPTO("paes");

MODULE_ALIAS_CRYPTO("ecb(paes)");

MODULE_ALIAS_CRYPTO("cbc(paes)");

MODULE_ALIAS_CRYPTO("ctr(paes)");

MODULE_ALIAS_CRYPTO("xts(paes)");



MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm with protected keys");

MODULE_LICENSE("GPL");

drivers/crypto/caam/caamhash.c

+1 −0
Original line number Diff line number Diff line
@@ -708,6 +708,7 @@ static struct ahash_edesc *ahash_edesc_alloc(struct ahash_request *req, 
		       GFP_KERNEL : GFP_ATOMIC;

	struct ahash_edesc *edesc;



	sg_num = pad_sg_nents(sg_num);

	edesc = kzalloc(struct_size(edesc, sec4_sg, sg_num), flags);

	if (!edesc)

		return NULL;