Skip to content

Commit 726bd34

Browse files
smuellerDDgregkh
authored andcommitted
crypto: algif_skcipher - only call put_page on referenced and used pages
commit 445a582 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 <[email protected]> Signed-off-by: Herbert Xu <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 44c6b4a commit 726bd34

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

crypto/algif_skcipher.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,13 @@ static void skcipher_free_async_sgls(struct skcipher_async_req *sreq)
8787
}
8888
sgl = sreq->tsg;
8989
n = sg_nents(sgl);
90-
for_each_sg(sgl, sg, n, i)
91-
put_page(sg_page(sg));
90+
for_each_sg(sgl, sg, n, i) {
91+
struct page *page = sg_page(sg);
92+
93+
/* some SGs may not have a page mapped */
94+
if (page && page_ref_count(page))
95+
put_page(page);
96+
}
9297

9398
kfree(sreq->tsg);
9499
}

0 commit comments

Comments
 (0)