summaryrefslogtreecommitdiff
path: root/drivers/crypto/amlogic/amlogic-gxl.h
diff options
context:
space:
mode:
authorArd Biesheuvel <ardb@kernel.org>2020-07-07 09:31:52 +0300
committerHerbert Xu <herbert@gondor.apana.org.au>2020-07-16 14:49:02 +0300
commit1d63e4557f0d11fd795c7acd50a241da2d8bf89f (patch)
treeeaf2e6bb3c9e61ddbe544eb53c52ba88cb2c4285 /drivers/crypto/amlogic/amlogic-gxl.h
parent3f368b886e95080daf811d228795c28716495279 (diff)
downloadlinux-1d63e4557f0d11fd795c7acd50a241da2d8bf89f.tar.xz
crypto: amlogic-gxl - permit async skcipher as fallback
Even though the amlogic-gxl driver implements asynchronous versions of ecb(aes) and cbc(aes), the fallbacks it allocates are required to be synchronous. Given that SIMD based software implementations are usually asynchronous as well, even though they rarely complete asynchronously (this typically only happens in cases where the request was made from softirq context, while SIMD was already in use in the task context that it interrupted), these implementations are disregarded, and either the generic C version or another table based version implemented in assembler is selected instead. Since falling back to synchronous AES is not only a performance issue, but potentially a security issue as well (due to the fact that table based AES is not time invariant), let's fix this, by allocating an ordinary skcipher as the fallback, and invoke it with the completion routine that was given to the outer request. Signed-off-by: Ard Biesheuvel <ardb@kernel.org> Tested-by: Corentin Labbe <clabbe@baylibre.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/crypto/amlogic/amlogic-gxl.h')
-rw-r--r--drivers/crypto/amlogic/amlogic-gxl.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/crypto/amlogic/amlogic-gxl.h b/drivers/crypto/amlogic/amlogic-gxl.h
index b7f2de91ab76..dc0f142324a3 100644
--- a/drivers/crypto/amlogic/amlogic-gxl.h
+++ b/drivers/crypto/amlogic/amlogic-gxl.h
@@ -109,6 +109,7 @@ struct meson_dev {
struct meson_cipher_req_ctx {
u32 op_dir;
int flow;
+ struct skcipher_request fallback_req; // keep at the end
};
/*
@@ -126,7 +127,7 @@ struct meson_cipher_tfm_ctx {
u32 keylen;
u32 keymode;
struct meson_dev *mc;
- struct crypto_sync_skcipher *fallback_tfm;
+ struct crypto_skcipher *fallback_tfm;
};
/*