diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2016-07-12 13:17:57 +0800 |
---|---|---|
committer | Jiri Slaby <jslaby@suse.cz> | 2016-08-19 09:51:08 +0200 |
commit | d65ae7e5666793747ff4f930fd81f59a95faa24e (patch) | |
tree | 888bd7530e7e44b05c99d6d1434e88918e1cfc47 /crypto | |
parent | 27f91af5e9249bad63cab196658f9e9707dde068 (diff) |
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: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'crypto')
-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); |