diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2019-04-15 14:35:19 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-05-02 10:02:44 +0200 |
| commit | 6506cdd4205b20e17dc0191fb00e02c48a146840 (patch) | |
| tree | 299923b93e51440ac385ccf1da963c1601c60a33 /crypto | |
| parent | 8659a04c77e2ca52ce2af42f7c50b49e690ffb19 (diff) | |
| download | linux-stable-6506cdd4205b20e17dc0191fb00e02c48a146840.tar.gz linux-stable-6506cdd4205b20e17dc0191fb00e02c48a146840.tar.bz2 linux-stable-6506cdd4205b20e17dc0191fb00e02c48a146840.zip | |
crypto: xts - Fix atomic sleep when walking skcipher
commit 44427c0fbc09b448b22410978a4ef6ee37599d25 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/xts.c | 6 |
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); } |