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

Commit adf1ca61 authored by Harsh Jain's avatar Harsh Jain Committed by Herbert Xu
Browse files

crypto: chcr - Adjust Dest. buffer size 



Destination buffer size passed to hardware should not be greater
than crypto operation output.

Signed-off-by: default avatarHarsh Jain <harsh@chelsio.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent cc1b156d

drivers/crypto/chelsio/chcr_algo.c

+20 −30
Original line number Diff line number Diff line
@@ -335,25 +335,13 @@ static inline int is_hmac(struct crypto_tfm *tfm) 
	return 0;

}



static inline unsigned int ch_nents(struct scatterlist *sg,

				    unsigned int *total_size)

{

	unsigned int nents;



	for (nents = 0, *total_size = 0; sg; sg = sg_next(sg)) {

		nents++;

		*total_size += sg->length;

	}

	return nents;

}



static void write_phys_cpl(struct cpl_rx_phys_dsgl *phys_cpl,

			   struct scatterlist *sg,

			   struct phys_sge_parm *sg_param)

{

	struct phys_sge_pairs *to;

	unsigned int out_buf_size = sg_param->obsize;

	unsigned int nents = sg_param->nents, i, j, tot_len = 0;

	int out_buf_size = sg_param->obsize;

	unsigned int nents = sg_param->nents, i, j = 0;



	phys_cpl->op_to_tid = htonl(CPL_RX_PHYS_DSGL_OPCODE_V(CPL_RX_PHYS_DSGL)

				    | CPL_RX_PHYS_DSGL_ISRDMA_V(0));
@@ -371,25 +359,24 @@ static void write_phys_cpl(struct cpl_rx_phys_dsgl *phys_cpl, 
				       sizeof(struct cpl_rx_phys_dsgl));



	for (i = 0; nents; to++) {

		for (j = i; (nents && (j < (8 + i))); j++, nents--) {

			to->len[j] = htons(sg->length);

		for (j = 0; j < 8 && nents; j++, nents--) {

			out_buf_size -= sg_dma_len(sg);

			to->len[j] = htons(sg_dma_len(sg));

			to->addr[j] = cpu_to_be64(sg_dma_address(sg));

			if (out_buf_size) {

				if (tot_len + sg_dma_len(sg) >= out_buf_size) {

					to->len[j] = htons(out_buf_size -

							   tot_len);

					return;

				}

				tot_len += sg_dma_len(sg);

			}

			sg = sg_next(sg);

		}

	}

	if (out_buf_size) {

		j--;

		to--;

		to->len[j] = htons(ntohs(to->len[j]) + (out_buf_size));

	}

}



static inline unsigned

int map_writesg_phys_cpl(struct device *dev, struct cpl_rx_phys_dsgl *phys_cpl,

			 struct scatterlist *sg, struct phys_sge_parm *sg_param)

static inline int map_writesg_phys_cpl(struct device *dev,

					struct cpl_rx_phys_dsgl *phys_cpl,

					struct scatterlist *sg,

					struct phys_sge_parm *sg_param)

{

	if (!sg || !sg_param->nents)

		return 0;
@@ -531,16 +518,19 @@ static struct sk_buff 
	struct cpl_rx_phys_dsgl *phys_cpl;

	struct chcr_blkcipher_req_ctx *req_ctx = ablkcipher_request_ctx(req);

	struct phys_sge_parm sg_param;

	unsigned int frags = 0, transhdr_len, phys_dsgl, dst_bufsize = 0;

	unsigned int frags = 0, transhdr_len, phys_dsgl;

	unsigned int ivsize = crypto_ablkcipher_ivsize(tfm), kctx_len;

	gfp_t flags = req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP ? GFP_KERNEL :

			GFP_ATOMIC;



	if (!req->info)

		return ERR_PTR(-EINVAL);

	ablkctx->dst_nents = ch_nents(req->dst, &dst_bufsize);

	ablkctx->dst_nents = sg_nents_for_len(req->dst, req->nbytes);

	if (ablkctx->dst_nents <= 0) {

		pr_err("AES:Invalid Destination sg lists\n");

		return ERR_PTR(-EINVAL);

	}

	ablkctx->enc = op_type;



	if ((ablkctx->enckey_len == 0) || (ivsize > AES_BLOCK_SIZE) ||

	    (req->nbytes <= 0) || (req->nbytes % AES_BLOCK_SIZE)) {

		pr_err("AES: Invalid value of Key Len %d nbytes %d IV Len %d\n",