diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2016-07-12 13:17:57 +0800 |
---|---|---|
committer | Sasha Levin <alexander.levin@verizon.com> | 2016-08-22 12:23:12 -0400 |
commit | 57eed939b9b93fab2533a27659c723d6e691e684 (patch) | |
tree | c6d8652a62c81bbfa5c89a5f44a8e6b4add491f0 /crypto/scatterwalk.c | |
parent | 6da472870a3d94d107a4e5af4164c422b3afac19 (diff) |
crypto: scatterwalk - Fix test in scatterwalk_done
[ Upstream commit 5f070e81bee35f1b7bd1477bb223a873ff657803 ]
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>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Diffstat (limited to 'crypto/scatterwalk.c')
-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 79ca2278c2a3..0ec7a6fa3d4d 100644 --- a/crypto/scatterwalk.c +++ b/crypto/scatterwalk.c @@ -68,7 +68,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); |