mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-05 22:59:43 +00:00
crypto: lrw - Fix use-after-free on EINPROGRESS
When we get an EINPROGRESS completion in lrw, we will end up marking
the request as done and freeing it. This then blows up when the
request is really completed as we've already freed the memory.
Fixes: 700cb3f5fe
("crypto: lrw - Convert to skcipher")
Cc: <stable@vger.kernel.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
parent
aa4a829bda
commit
4702bbeefb
16
crypto/lrw.c
16
crypto/lrw.c
@ -345,6 +345,13 @@ static void encrypt_done(struct crypto_async_request *areq, int err)
|
|||||||
struct rctx *rctx;
|
struct rctx *rctx;
|
||||||
|
|
||||||
rctx = skcipher_request_ctx(req);
|
rctx = skcipher_request_ctx(req);
|
||||||
|
|
||||||
|
if (err == -EINPROGRESS) {
|
||||||
|
if (rctx->left != req->cryptlen)
|
||||||
|
return;
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
|
||||||
subreq = &rctx->subreq;
|
subreq = &rctx->subreq;
|
||||||
subreq->base.flags &= CRYPTO_TFM_REQ_MAY_BACKLOG;
|
subreq->base.flags &= CRYPTO_TFM_REQ_MAY_BACKLOG;
|
||||||
|
|
||||||
@ -352,6 +359,7 @@ static void encrypt_done(struct crypto_async_request *areq, int err)
|
|||||||
if (rctx->left)
|
if (rctx->left)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
out:
|
||||||
skcipher_request_complete(req, err);
|
skcipher_request_complete(req, err);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -389,6 +397,13 @@ static void decrypt_done(struct crypto_async_request *areq, int err)
|
|||||||
struct rctx *rctx;
|
struct rctx *rctx;
|
||||||
|
|
||||||
rctx = skcipher_request_ctx(req);
|
rctx = skcipher_request_ctx(req);
|
||||||
|
|
||||||
|
if (err == -EINPROGRESS) {
|
||||||
|
if (rctx->left != req->cryptlen)
|
||||||
|
return;
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
|
||||||
subreq = &rctx->subreq;
|
subreq = &rctx->subreq;
|
||||||
subreq->base.flags &= CRYPTO_TFM_REQ_MAY_BACKLOG;
|
subreq->base.flags &= CRYPTO_TFM_REQ_MAY_BACKLOG;
|
||||||
|
|
||||||
@ -396,6 +411,7 @@ static void decrypt_done(struct crypto_async_request *areq, int err)
|
|||||||
if (rctx->left)
|
if (rctx->left)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
out:
|
||||||
skcipher_request_complete(req, err);
|
skcipher_request_complete(req, err);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user