Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57eed939 authored by Herbert Xu's avatar Herbert Xu Committed by Sasha Levin
Browse files

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: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
parent 6da47287

crypto/scatterwalk.c

+2 −1
Original line number Diff line number Diff line
@@ -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);