diff options
author | Stephan Mueller <smueller@chronox.de> | 2017-08-16 11:56:24 +0200 |
---|---|---|
committer | Sasha Levin <alexander.levin@verizon.com> | 2017-10-03 21:36:43 -0400 |
commit | 14d50b623de85f26798581f84439a027b79c4262 (patch) | |
tree | 62205ca9a4ff336379b4a30ea837b8f91cd976c1 /crypto/algif_skcipher.c | |
parent | 9453bd77685ef531d72bf15f74b5aeef6436b797 (diff) |
crypto: algif_skcipher - only call put_page on referenced and used pages
[ Upstream commit 445a582738de6802669aeed9c33ca406c23c3b1f ]
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.
Cc: <stable@vger.kernel.org>
Signed-off-by: Stephan Mueller <smueller@chronox.de>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Diffstat (limited to 'crypto/algif_skcipher.c')
-rw-r--r-- | crypto/algif_skcipher.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c index c0f03562a145..3734c5591d07 100644 --- a/crypto/algif_skcipher.c +++ b/crypto/algif_skcipher.c @@ -94,8 +94,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 && atomic_read(&page->_count)) + put_page(page); + } kfree(sreq->tsg); } |