crypto: xts - Fix use-after-free on EINPROGRESS (aa4a829b) · Commits · 戴 / test

When we get an EINPROGRESS completion in xts, 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: ("crypto: xts - Convert to skcipher") Cc: <stable@vger.kernel.org> Reported-by:

Nathan Royce <nroycea+kernel@gmail.com> Reported-by:

Krzysztof Kozlowski <krzk@kernel.org> Signed-off-by:

Herbert Xu <herbert@gondor.apana.org.au> Tested-by:

Krzysztof Kozlowski <krzk@kernel.org>

crypto/xts.c

+16 −0

Original line number	Diff line number	Diff line
		@@ -286,6 +286,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;

		@@ -293,6 +300,7 @@ static void encrypt_done(struct crypto_async_request *areq, int err)
		if (rctx->left)
		return;

		out:
		skcipher_request_complete(req, err);
		}

		@@ -330,6 +338,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;

		@@ -337,6 +352,7 @@ static void decrypt_done(struct crypto_async_request *areq, int err)
		if (rctx->left)
		return;

		out:
		skcipher_request_complete(req, err);
		}

Admin message