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

Commit 03bd90fc authored by Herbert Xu's avatar Herbert Xu Committed by Greg Kroah-Hartman
Browse files

crypto: shash - Fix zero-length shash ahash digest crash 



commit b61907bb42409adf9b3120f741af7c57dd7e3db2 upstream.

The shash ahash digest adaptor function may crash if given a
zero-length input together with a null SG list.  This is because
it tries to read the SG list before looking at the length.

This patch fixes it by checking the length first.

Reported-by: default avatarStephan <Müller&lt;smueller@chronox.de>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Tested-by: default avatarStephan Müller <smueller@chronox.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2929cb99

crypto/shash.c

+5 −3
Original line number Diff line number Diff line
@@ -274,12 +274,14 @@ static int shash_async_finup(struct ahash_request *req) 


int shash_ahash_digest(struct ahash_request *req, struct shash_desc *desc)

{

	struct scatterlist *sg = req->src;

	unsigned int offset = sg->offset;

	unsigned int nbytes = req->nbytes;

	struct scatterlist *sg;

	unsigned int offset;

	int err;



	if (nbytes < min(sg->length, ((unsigned int)(PAGE_SIZE)) - offset)) {

	if (nbytes &&

	    (sg = req->src, offset = sg->offset,

	     nbytes < min(sg->length, ((unsigned int)(PAGE_SIZE)) - offset))) {

		void *data;



		data = kmap_atomic(sg_page(sg));