diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-09-24 19:46:54 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-09-24 19:46:54 +0200 |
| commit | 1cfb46051db9ddb68e297eaf17270e09874ec5f3 (patch) | |
| tree | 7a10d273671465181392d02b854ed3211a6faddf /arch/s390 | |
| parent | Merge tag 'landlock-6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | crypto: powerpc/p10-aes-gcm - Disable CRYPTO_AES_GCM_P10 (diff) | |
| download | linux-1cfb46051db9ddb68e297eaf17270e09874ec5f3.tar.xz linux-1cfb46051db9ddb68e297eaf17270e09874ec5f3.zip | |
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
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/crypto/paes_s390.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/s390/crypto/paes_s390.c b/arch/s390/crypto/paes_s390.c index d68647d64eb4..ef4491ccbbf8 100644 --- a/arch/s390/crypto/paes_s390.c +++ b/arch/s390/crypto/paes_s390.c @@ -802,7 +802,10 @@ out_err: 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"); |