Commit 801b100b authored by Herbert Xu's avatar Herbert Xu Committed by Willy Tarreau

crypto: scatterwalk - Fix test in scatterwalk_done

commit 5f070e81 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.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarWilly Tarreau <w@1wt.eu>
parent ef15fd6c
...@@ -68,7 +68,8 @@ static void scatterwalk_pagedone(struct scatter_walk *walk, int out, ...@@ -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) 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); scatterwalk_pagedone(walk, out, more);
} }
EXPORT_SYMBOL_GPL(scatterwalk_done); EXPORT_SYMBOL_GPL(scatterwalk_done);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment