summaryrefslogtreecommitdiff
path: root/crypto/xts.c
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
commit75990e5569b2af923a57cf78fd7976fc4ac2763c (patch)
treedfe78042ae076bb937653ce77ab6cc36f49f8ad8 /crypto/xts.c
parent4df59b3e52bf0961a6b9991e191201fe74c6f822 (diff)
downloadlinux-crypto-75990e5569b2af923a57cf78fd7976fc4ac2763c.tar.gz
linux-crypto-75990e5569b2af923a57cf78fd7976fc4ac2763c.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: e75189cd49c6 ("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/xts.c')
-rw-r--r--crypto/xts.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/crypto/xts.c b/crypto/xts.c
index 847f54f7..2f948328 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);
}