diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-03-19 01:50:29 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-03-19 01:50:29 +0300 |
| commit | 1863b4055b7902de43a1dcc7396805eb631682e5 (patch) | |
| tree | 7ea64ca6855fa0add866b3916e966b62f4796a60 /drivers | |
| parent | 8a30aeb0d1b4e4aaf7f7bae72f20f2ae75385ccb (diff) | |
| parent | d5b66179b0e27c14a9033c4356937506577485e3 (diff) | |
| download | linux-1863b4055b7902de43a1dcc7396805eb631682e5.tar.xz | |
Merge tag 'libcrypto-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux
Pull crypto library fixes from Eric Biggers:
- Disable the "padlock" SHA-1 and SHA-256 driver on Zhaoxin
processors, since it does not compute hash values correctly
- Make a generated file be removed by 'make clean'
- Fix excessive stack usage in some of the arm64 AES code
* tag 'libcrypto-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux:
lib/crypto: powerpc: Add powerpc/aesp8-ppc.S to clean-files
crypto: padlock-sha - Disable for Zhaoxin processor
crypto: arm64/aes-neonbs - Move key expansion off the stack
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/crypto/padlock-sha.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/crypto/padlock-sha.c b/drivers/crypto/padlock-sha.c index 329f60ad422e..9214bbfc868f 100644 --- a/drivers/crypto/padlock-sha.c +++ b/drivers/crypto/padlock-sha.c @@ -332,6 +332,13 @@ static int __init padlock_init(void) if (!x86_match_cpu(padlock_sha_ids) || !boot_cpu_has(X86_FEATURE_PHE_EN)) return -ENODEV; + /* + * Skip family 0x07 and newer used by Zhaoxin processors, + * as the driver's self-tests fail on these CPUs. + */ + if (c->x86 >= 0x07) + return -ENODEV; + /* Register the newly added algorithm module if on * * VIA Nano processor, or else just do as before */ if (c->x86_model < 0x0f) { |