From: Ard Biesheuvel <ardb@kernel.org>
To: linux-crypto@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org, ebiggers@kernel.org,
herbert@gondor.apana.org.au, will@kernel.org,
kernel-team@android.com, Ard Biesheuvel <ardb@kernel.org>
Subject: [PATCH v4 2/7] crypto: aead - disallow en/decrypt for non-task or non-softirq context
Date: Wed, 19 May 2021 13:22:34 +0200 [thread overview]
Message-ID: <20210519112239.33664-3-ardb@kernel.org> (raw)
In-Reply-To: <20210519112239.33664-1-ardb@kernel.org>
In order to ensure that kernel mode SIMD routines will not need a scalar
fallback if they run with softirqs disabled, disallow any use of the
AEAD encrypt and decrypt routines from outside of task or softirq context.
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
crypto/aead.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/crypto/aead.c b/crypto/aead.c
index 16991095270d..141c9369b02a 100644
--- a/crypto/aead.c
+++ b/crypto/aead.c
@@ -88,7 +88,11 @@ int crypto_aead_encrypt(struct aead_request *req)
int ret;
crypto_stats_get(alg);
- if (crypto_aead_get_flags(aead) & CRYPTO_TFM_NEED_KEY)
+ if (!(alg->cra_flags & CRYPTO_ALG_ASYNC) &&
+ WARN_ONCE(!in_task() && !in_serving_softirq(),
+ "synchronous call from invalid context\n"))
+ ret = -EBUSY;
+ else if (crypto_aead_get_flags(aead) & CRYPTO_TFM_NEED_KEY)
ret = -ENOKEY;
else
ret = crypto_aead_alg(aead)->encrypt(req);
@@ -105,7 +109,11 @@ int crypto_aead_decrypt(struct aead_request *req)
int ret;
crypto_stats_get(alg);
- if (crypto_aead_get_flags(aead) & CRYPTO_TFM_NEED_KEY)
+ if (!(alg->cra_flags & CRYPTO_ALG_ASYNC) &&
+ WARN_ONCE(!in_task() && !in_serving_softirq(),
+ "synchronous call from invalid context\n"))
+ ret = -EBUSY;
+ else if (crypto_aead_get_flags(aead) & CRYPTO_TFM_NEED_KEY)
ret = -ENOKEY;
else if (req->cryptlen < crypto_aead_authsize(aead))
ret = -EINVAL;
--
2.20.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-05-19 12:55 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-19 11:22 [PATCH v4 0/7] running kernel mode SIMD with softirqs disabled Ard Biesheuvel
2021-05-19 11:22 ` [PATCH v4 1/7] crypto: skcipher - handle zero sized inputs correctly Ard Biesheuvel
2021-05-19 11:22 ` Ard Biesheuvel [this message]
2021-05-19 11:29 ` [PATCH v4 2/7] crypto: aead - disallow en/decrypt for non-task or non-softirq context Herbert Xu
2021-05-19 11:36 ` Ard Biesheuvel
2021-05-19 11:51 ` Herbert Xu
2021-05-21 7:30 ` Ard Biesheuvel
2021-05-19 11:22 ` [PATCH v4 3/7] crypto: skcipher " Ard Biesheuvel
2021-05-19 11:22 ` [PATCH v4 4/7] crypto: arm64/gcm-aes-ce - remove non-SIMD fallback path Ard Biesheuvel
2021-05-19 11:22 ` [PATCH v4 5/7] crypto: arm64/aes-neonbs - stop using SIMD helper for skciphers Ard Biesheuvel
2021-05-19 11:22 ` [PATCH v4 6/7] crypto: arm64/aes-ce " Ard Biesheuvel
2021-05-19 11:22 ` [PATCH v4 7/7] crypto: arm64/aes-ccm - remove non-SIMD fallback path Ard Biesheuvel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210519112239.33664-3-ardb@kernel.org \
--to=ardb@kernel.org \
--cc=ebiggers@kernel.org \
--cc=herbert@gondor.apana.org.au \
--cc=kernel-team@android.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-crypto@vger.kernel.org \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).