diff mbox

crypto: only call put_page used pages

Message ID 2555546.QkgIzR2raW@positron.chronox.de (mailing list archive)
State Superseded
Delegated to: Herbert Xu
Headers show

Commit Message

Stephan Mueller Sept. 10, 2016, 3:42 a.m. UTC
Hi Herbert,

This patch was tested with up to 64 iocb submitted with one io_submit call.

If you approve of this fix, I recommend that should go to the current 4.8 development cycle and to stable.

---8<---

For asynchronous operation, SGs are allocated without a page mapped to
them. If the SGL is freed, the code must only call put_page for an SG if
there was a page assigned to it in the first place.

This fixes a kernel crash when using io_submit with more than one iocb.

Signed-off-by: Stephan Mueller <smueller@chronox.de>
---
 crypto/algif_skcipher.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
diff mbox

Patch

diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c
index 28556fc..58ec57a 100644
--- a/crypto/algif_skcipher.c
+++ b/crypto/algif_skcipher.c
@@ -86,8 +86,13 @@  static void skcipher_free_async_sgls(struct skcipher_async_req *sreq)
 	}
 	sgl = sreq->tsg;
 	n = sg_nents(sgl);
-	for_each_sg(sgl, sg, n, i)
-		put_page(sg_page(sg));
+	for_each_sg(sgl, sg, n, i) {
+		struct page *page = sg_page(sg);
+
+		/* some SGs may not have a page mapped */
+		if (page_ref_count(page))
+			put_page(sg_page(sg));
+	}
 
 	kfree(sreq->tsg);
 }