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

Commit 4fa9948c authored Nov 04, 2015 by LABBE Corentin Committed by Herbert Xu Nov 17, 2015

crypto: qce - check return value of sg_nents_for_len



The sg_nents_for_len() function could fail, this patch add a check for
its return value.

Signed-off-by: LABBE Corentin <clabbe.montjoie@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

parent 6c2b74d4

drivers/crypto/qce/ablkcipher.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -83,6 +83,14 @@ qce_ablkcipher_async_req_handle(struct crypto_async_request *async_req)
		rctx->dst_nents = sg_nents_for_len(req->dst, req->nbytes);
		else
		rctx->dst_nents = rctx->src_nents;
		if (rctx->src_nents < 0) {
		dev_err(qce->dev, "Invalid numbers of src SG.\n");
		return rctx->src_nents;
		}
		if (rctx->dst_nents < 0) {
		dev_err(qce->dev, "Invalid numbers of dst SG.\n");
		return -rctx->dst_nents;
		}

		rctx->dst_nents += 1;

drivers/crypto/qce/sha.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -92,6 +92,11 @@ static int qce_ahash_async_req_handle(struct crypto_async_request *async_req)
		}

		rctx->src_nents = sg_nents_for_len(req->src, req->nbytes);
		if (rctx->src_nents < 0) {
		dev_err(qce->dev, "Invalid numbers of src SG.\n");
		return rctx->src_nents;
		}

		ret = dma_map_sg(qce->dev, req->src, rctx->src_nents, DMA_TO_DEVICE);
		if (ret < 0)
		return ret;