diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2018-08-07 23:18:36 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-09-09 10:32:42 +0200 |
| commit | 26b165edc3e43df104cacadc9e9760c812a2b202 (patch) | |
| tree | 7c1af38237c476156c611e061809213494da2e66 | |
| parent | dce1a2c6f33996d39e5cfbd4009db176bfa629de (diff) | |
| download | linux-stable-26b165edc3e43df104cacadc9e9760c812a2b202.tar.gz linux-stable-26b165edc3e43df104cacadc9e9760c812a2b202.tar.bz2 linux-stable-26b165edc3e43df104cacadc9e9760c812a2b202.zip | |
crypto: arm64/sm4-ce - check for the right CPU feature bit
commit 7fa885e2a22fd0f91a2c23d9275f5021f618ff5a upstream.
ARMv8.2 specifies special instructions for the SM3 cryptographic hash
and the SM4 symmetric cipher. While it is unlikely that a core would
implement one and not the other, we should only use SM4 instructions
if the SM4 CPU feature bit is set, and we currently check the SM3
feature bit instead. So fix that.
Fixes: e99ce921c468 ("crypto: arm64 - add support for SM4...")
Cc: <stable@vger.kernel.org>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | arch/arm64/crypto/sm4-ce-glue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/crypto/sm4-ce-glue.c b/arch/arm64/crypto/sm4-ce-glue.c index b7fb5274b250..0c4fc223f225 100644 --- a/arch/arm64/crypto/sm4-ce-glue.c +++ b/arch/arm64/crypto/sm4-ce-glue.c @@ -69,5 +69,5 @@ static void __exit sm4_ce_mod_fini(void) crypto_unregister_alg(&sm4_ce_alg); } -module_cpu_feature_match(SM3, sm4_ce_mod_init); +module_cpu_feature_match(SM4, sm4_ce_mod_init); module_exit(sm4_ce_mod_fini); |