diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2017-07-04 12:21:12 +0800 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2017-10-12 15:28:01 +0100 |
| commit | 15ee118283dbb3636dc6fbab13291ca2a3d17758 (patch) | |
| tree | 5527227212731224e125036671a9fd8153e79ca4 /arch | |
| parent | a06749016adf68ad281256ddcf74e3bdf7ae28f7 (diff) | |
crypto: sha1-ssse3 - Disable avx2
commit b82ce24426a4071da9529d726057e4e642948667 upstream.
It has been reported that sha1-avx2 can cause page faults by reading
beyond the end of the input. This patch disables it until it can be
fixed.
Fixes: 7c1da8d0d046 ("crypto: sha - SHA1 transform x86_64 AVX2")
Reported-by: Jan Stancek <jstancek@redhat.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
[bwh: Backported to 3.16: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/crypto/sha1_ssse3_glue.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/crypto/sha1_ssse3_glue.c b/arch/x86/crypto/sha1_ssse3_glue.c index 6c20fe04a738..ba9c75c5a432 100644 --- a/arch/x86/crypto/sha1_ssse3_glue.c +++ b/arch/x86/crypto/sha1_ssse3_glue.c @@ -224,7 +224,8 @@ static bool __init avx_usable(void) #ifdef CONFIG_AS_AVX2 static bool __init avx2_usable(void) { - if (avx_usable() && cpu_has_avx2 && boot_cpu_has(X86_FEATURE_BMI1) && + if (false && avx_usable() && cpu_has_avx2 && + boot_cpu_has(X86_FEATURE_BMI1) && boot_cpu_has(X86_FEATURE_BMI2)) return true; |