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

Commit 803eeae8 authored by Leilei Zhao's avatar Leilei Zhao Committed by Herbert Xu
Browse files

crypto: atmel-sha - fix sg list management 



Having a zero length sg doesn't mean it is the end of the sg list. This
case happens when calculating HMAC of IPSec packet.

Signed-off-by: default avatarLeilei Zhao <leilei.zhao@atmel.com>
Signed-off-by: default avatarLudovic Desroches <ludovic.desroches@atmel.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 0099286b

drivers/crypto/atmel-sha.c

+14 −2
Original line number Diff line number Diff line
@@ -163,8 +163,20 @@ static size_t atmel_sha_append_sg(struct atmel_sha_reqctx *ctx) 
		count = min(ctx->sg->length - ctx->offset, ctx->total);

		count = min(count, ctx->buflen - ctx->bufcnt);



		if (count <= 0)

		if (count <= 0) {

			/*

			* Check if count <= 0 because the buffer is full or

			* because the sg length is 0. In the latest case,

			* check if there is another sg in the list, a 0 length

			* sg doesn't necessarily mean the end of the sg list.

			*/

			if ((ctx->sg->length == 0) && !sg_is_last(ctx->sg)) {

				ctx->sg = sg_next(ctx->sg);

				continue;

			} else {

				break;

			}

		}



		scatterwalk_map_and_copy(ctx->buffer + ctx->bufcnt, ctx->sg,

			ctx->offset, count, 0);