aboutsummaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2019-04-15 14:35:19 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2019-04-18 22:13:46 +0800
commit44427c0fbc09b448b22410978a4ef6ee37599d25 (patch)
tree627b51f2fb828907f1b06088bd1832d798074a49 /crypto
parentcrypto: x86/poly1305 - fix overflow during partial reduction (diff)
downloadlinux-dev-44427c0fbc09b448b22410978a4ef6ee37599d25.tar.xz
linux-dev-44427c0fbc09b448b22410978a4ef6ee37599d25.zip
crypto: xts - Fix atomic sleep when walking skcipher
When we perform a walk in the completion function, we need to ensure that it is atomic. Reported-by: syzbot+6f72c20560060c98b566@syzkaller.appspotmail.com Fixes: 78105c7e769b ("crypto: xts - Drop use of auxiliary buffer") Cc: <stable@vger.kernel.org> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Acked-by: Ondrej Mosnacek <omosnace@redhat.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/xts.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/crypto/xts.c b/crypto/xts.c
index 847f54f76789..2f948328cabb 100644
--- a/crypto/xts.c
+++ b/crypto/xts.c
@@ -137,8 +137,12 @@ static void crypt_done(struct crypto_async_request *areq, int err)
{
struct skcipher_request *req = areq->data;
- if (!err)
+ if (!err) {
+ struct rctx *rctx = skcipher_request_ctx(req);
+
+ rctx->subreq.base.flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
err = xor_tweak_post(req);
+ }
skcipher_request_complete(req, err);
}