diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2016-07-12 13:17:57 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2016-07-18 17:35:49 +0800 |
| commit | 5f070e81bee35f1b7bd1477bb223a873ff657803 (patch) | |
| tree | 102ab17bc58b1ea8cdb3b5fed872f7cae19c5a28 | |
| parent | 4140139734459db4dffc50dad7b9e21ed79a8dd9 (diff) | |
| download | linux-stable-5f070e81bee35f1b7bd1477bb223a873ff657803.tar.gz linux-stable-5f070e81bee35f1b7bd1477bb223a873ff657803.tar.bz2 linux-stable-5f070e81bee35f1b7bd1477bb223a873ff657803.zip | |
crypto: scatterwalk - Fix test in scatterwalk_done
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.
Cc: stable@vger.kernel.org
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
| -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 e124ce26feed..52aae2974794 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); |