diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2016-07-12 13:17:57 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-08-16 09:35:00 +0200 |
| commit | 1539c4d5d3df046cb36c3fed2ea435c34abc4e05 (patch) | |
| tree | 8659c6c445b91913a5f696438ee086cf98848e57 | |
| parent | cab0805d7cf18537660ad51b6b9d991263676921 (diff) | |
| download | linux-stable-1539c4d5d3df046cb36c3fed2ea435c34abc4e05.tar.gz linux-stable-1539c4d5d3df046cb36c3fed2ea435c34abc4e05.tar.bz2 linux-stable-1539c4d5d3df046cb36c3fed2ea435c34abc4e05.zip | |
crypto: scatterwalk - Fix test in scatterwalk_done
commit 5f070e81bee35f1b7bd1477bb223a873ff657803 upstream.
When there is more data to be processed, the current test in
scatterwalk_done may prevent us from calling pagedone even when
we should.
In particular, if we're on an SG entry spanning multiple pages
where the last page is not a full page, we will incorrectly skip
calling pagedone on the second last page.
This patch fixes this by adding a separate test for whether we've
reached the end of a page.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | crypto/scatterwalk.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/scatterwalk.c b/crypto/scatterwalk.c index ea5815c5e128..bc769c448d4a 100644 --- a/crypto/scatterwalk.c +++ b/crypto/scatterwalk.c @@ -72,7 +72,8 @@ static void scatterwalk_pagedone(struct scatter_walk *walk, int out, void scatterwalk_done(struct scatter_walk *walk, int out, int more) { - if (!(scatterwalk_pagelen(walk) & (PAGE_SIZE - 1)) || !more) + if (!more || walk->offset >= walk->sg->offset + walk->sg->length || + !(walk->offset & (PAGE_SIZE - 1))) scatterwalk_pagedone(walk, out, more); } EXPORT_SYMBOL_GPL(scatterwalk_done); |