Skip to contentSkip to conversation

Patch "crypto: xts - Fix use-after-free on EINPROGRESS" has been added to the 4.10-stable tree

PATCH [email protected] 1 participant 1 message Apr 19, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

crypto: xts - Fix use-after-free on EINPROGRESS

to the 4.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
crypto-xts-fix-use-after-free-on-einprogress.patch
and it can be found in the queue-4.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From aa4a829bdaced81e70c215a84ef6595ce8bd4308 Mon Sep 17 00:00:00 2001

From: Herbert Xu <[email protected]>
Date: Sat, 8 Apr 2017 10:02:46 +0800
Subject: crypto: xts - Fix use-after-free on EINPROGRESS

From: Herbert Xu <[email protected]>

commit aa4a829bdaced81e70c215a84ef6595ce8bd4308 upstream.

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.

---
 crypto/xts.c |   16 ++++++++++++++++
 1 file changed, 16 insertions(+)
crypto/xts.c +16 -0
@@ -286,6 +286,13 @@ static void encrypt_done(struct crypto_a
 	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_a
 	if (rctx->left)
 		return;
 
+out:
 	skcipher_request_complete(req, err);
 }
 
@@ -330,6 +338,13 @@ static void decrypt_done(struct crypto_a
 	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_a
 	if (rctx->left)
 		return;
 
+out:
 	skcipher_request_complete(req, err);
 }
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.10/crypto-lrw-fix-use-after-free-on-einprogress.patch queue-4.10/crypto-algif_aead-fix-bogus-request-dereference-in-completion-function.patch queue-4.10/crypto-ahash-fix-einprogress-notification-callback.patch queue-4.10/crypto-xts-fix-use-after-free-on-einprogress.patch