a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

crypto: scatterwalk - Fix test in scatterwalk_done

Browse Source 
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>
This commit is contained in:
Herbert Xu 2016-07-12 13:17:57 +08:00 committed by Greg Kroah-Hartman
parent 148fbb9668
commit 08bb036c9d
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crypto/scatterwalk.c
View File

@ -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) 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);