stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org, Stephan Mueller <smueller@chronox.de>,
	Herbert Xu <herbert@gondor.apana.org.au>
Subject: [PATCH 4.4 16/16] crypto: algif_skcipher - only call put_page on referenced and used pages
Date: Tue,  5 Sep 2017 09:10:06 +0200	[thread overview]
Message-ID: <20170905070905.207744596@linuxfoundation.org> (raw)
In-Reply-To: <20170905070904.465037171@linuxfoundation.org>

4.4-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Stephan Mueller <smueller@chronox.de>

commit 445a582738de6802669aeed9c33ca406c23c3b1f upstream.

For asynchronous operation, SGs are allocated without a page mapped to
them or with a page that is not used (ref-counted). If the SGL is freed,
the code must only call put_page for an SG if there was a page assigned
and ref-counted in the first place.

This fixes a kernel crash when using io_submit with more than one iocb
using the sendmsg and sendpage (vmsplice/splice) interface.

Signed-off-by: Stephan Mueller <smueller@chronox.de>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>


---
 crypto/algif_skcipher.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

--- a/crypto/algif_skcipher.c
+++ b/crypto/algif_skcipher.c
@@ -86,8 +86,13 @@ static void skcipher_free_async_sgls(str
 	}
 	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 && atomic_read(&page->_count))
+			put_page(page);
+	}
 
 	kfree(sreq->tsg);
 }

  parent reply	other threads:[~2017-09-05  7:10 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-05  7:09 [PATCH 4.4 00/16] 4.4.87-stable review Greg Kroah-Hartman
2017-09-05  7:09 ` [PATCH 4.4 01/16] irqchip: mips-gic: SYNC after enabling GIC region Greg Kroah-Hartman
2017-09-05  7:09 ` [PATCH 4.4 02/16] i2c: ismt: Dont duplicate the receive length for block reads Greg Kroah-Hartman
2017-09-05  7:09 ` [PATCH 4.4 03/16] i2c: ismt: Return EMSGSIZE for block reads with bogus length Greg Kroah-Hartman
2017-09-05  7:09 ` [PATCH 4.4 04/16] ceph: fix readpage from fscache Greg Kroah-Hartman
2017-09-05  7:09 ` [PATCH 4.4 05/16] cpumask: fix spurious cpumask_of_node() on non-NUMA multi-node configs Greg Kroah-Hartman
2017-09-05  7:09 ` [PATCH 4.4 06/16] cpuset: Fix incorrect memory_pressure control file mapping Greg Kroah-Hartman
2017-09-05  7:09 ` [PATCH 4.4 07/16] alpha: uapi: Add support for __SANE_USERSPACE_TYPES__ Greg Kroah-Hartman
2017-09-05  7:09 ` [PATCH 4.4 08/16] CIFS: Fix maximum SMB2 header size Greg Kroah-Hartman
2017-09-05  7:09 ` [PATCH 4.4 09/16] CIFS: remove endian related sparse warning Greg Kroah-Hartman
2017-09-05  7:10 ` [PATCH 4.4 10/16] wl1251: add a missing spin_lock_init() Greg Kroah-Hartman
2017-09-05  7:10 ` [PATCH 4.4 11/16] xfrm: policy: check policy direction value Greg Kroah-Hartman
2017-09-05  7:10 ` [PATCH 4.4 14/16] kvm: arm/arm64: Force reading uncached stage2 PGD Greg Kroah-Hartman
2017-09-05  7:10 ` Greg Kroah-Hartman [this message]
2017-09-05 16:47 ` [PATCH 4.4 00/16] 4.4.87-stable review Guenter Roeck
2017-09-05 17:12 ` Shuah Khan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170905070905.207744596@linuxfoundation.org \
    --to=gregkh@linuxfoundation.org \
    --cc=herbert@gondor.apana.org.au \
    --cc=linux-kernel@vger.kernel.org \
    --cc=smueller@chronox.de \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).