diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2017-04-10 17:15:48 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-04-21 09:32:41 +0200 |
| commit | aa7ca04fb26cd374e4b9739b9fc070025ea8c490 (patch) | |
| tree | 90c0fe807b4ce58cb88c5308a4a8741ed6997a5e /crypto | |
| parent | cb0567fc5114948df953403133944db83999ab48 (diff) | |
| download | linux-aa7ca04fb26cd374e4b9739b9fc070025ea8c490.tar.gz linux-aa7ca04fb26cd374e4b9739b9fc070025ea8c490.tar.bz2 linux-aa7ca04fb26cd374e4b9739b9fc070025ea8c490.zip | |
crypto: lrw - Fix use-after-free on EINPROGRESS
commit 4702bbeefb490e315189636a5588628c1151223d upstream.
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: 700cb3f5fe75 ("crypto: lrw - Convert to skcipher")
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/lrw.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/crypto/lrw.c b/crypto/lrw.c index 3ea095adafd9..a8bfae4451bf 100644 --- a/crypto/lrw.c +++ b/crypto/lrw.c @@ -345,6 +345,13 @@ static void encrypt_done(struct crypto_async_request *areq, int err) struct rctx *rctx; rctx = skcipher_request_ctx(req); + + if (err == -EINPROGRESS) { + if (rctx->left != req->cryptlen) + return; + goto out; + } + subreq = &rctx->subreq; 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) return; +out: skcipher_request_complete(req, err); } @@ -389,6 +397,13 @@ static void decrypt_done(struct crypto_async_request *areq, int err) struct rctx *rctx; rctx = skcipher_request_ctx(req); + + if (err == -EINPROGRESS) { + if (rctx->left != req->cryptlen) + return; + goto out; + } + subreq = &rctx->subreq; 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) return; +out: skcipher_request_complete(req, err); } |