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

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

crypto: marvell - 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 652d5b8a

drivers/crypto/marvell/cipher.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -401,7 +401,15 @@ static int mv_cesa_ablkcipher_req_init(struct ablkcipher_request *req,
		return -EINVAL;

		creq->src_nents = sg_nents_for_len(req->src, req->nbytes);
		if (creq->src_nents < 0) {
		dev_err(cesa_dev->dev, "Invalid number of src SG");
		return creq->src_nents;
		}
		creq->dst_nents = sg_nents_for_len(req->dst, req->nbytes);
		if (creq->dst_nents < 0) {
		dev_err(cesa_dev->dev, "Invalid number of dst SG");
		return creq->dst_nents;
		}

		mv_cesa_update_op_cfg(tmpl, CESA_SA_DESC_CFG_OP_CRYPT_ONLY,
		CESA_SA_DESC_CFG_OP_MSK);

drivers/crypto/marvell/hash.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -712,6 +712,10 @@ static int mv_cesa_ahash_req_init(struct ahash_request req, bool cached)
		creq->req.base.type = CESA_STD_REQ;

		creq->src_nents = sg_nents_for_len(req->src, req->nbytes);
		if (creq->src_nents < 0) {
		dev_err(cesa_dev->dev, "Invalid number of src SG");
		return creq->src_nents;
		}

		ret = mv_cesa_ahash_cache_req(req, cached);
		if (ret)