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

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

[gregkh]

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

    crypto: lrw - 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-lrw-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 <stable@vger.kernel.org> know about it.


>From 4702bbeefb490e315189636a5588628c1151223d Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Mon, 10 Apr 2017 17:15:48 +0800
Subject: crypto: lrw - Fix use-after-free on EINPROGRESS

From: Herbert Xu <herbert@gondor.apana.org.au>

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>

---
 crypto/lrw.c |   16 ++++++++++++++++
 1 file changed, 16 insertions(+)

--- a/crypto/lrw.c
+++ b/crypto/lrw.c
@@ -345,6 +345,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;
 
@@ -352,6 +359,7 @@ static void encrypt_done(struct crypto_a
 	if (rctx->left)
 		return;
 
+out:
 	skcipher_request_complete(req, err);
 }
 
@@ -389,6 +397,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;
 
@@ -396,6 +411,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 herbert@gondor.apana.org.au 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