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

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

crypto: chelsio - Fix src buffer dma length 



ulptx header cannot have length > 64k. Adjust length accordingly.

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

drivers/crypto/chelsio/chcr_algo.c

+12 −5
Original line number Original line Diff line number Diff line
@@ -662,7 +662,7 @@ static int chcr_sg_ent_in_wr(struct scatterlist *src, 
{

{

	int srclen = 0, dstlen = 0;

	int srclen = 0, dstlen = 0;

	int srcsg = minsg, dstsg = minsg;

	int srcsg = minsg, dstsg = minsg;

	int offset = 0, less;

	int offset = 0, soffset = 0, less, sless = 0;





	if (sg_dma_len(src) == srcskip) {

	if (sg_dma_len(src) == srcskip) {

		src = sg_next(src);

		src = sg_next(src);
@@ -676,7 +676,9 @@ static int chcr_sg_ent_in_wr(struct scatterlist *src, 




	while (src && dst &&

	while (src && dst &&

	       space > (sgl_ent_len[srcsg + 1] + dsgl_ent_len[dstsg])) {

	       space > (sgl_ent_len[srcsg + 1] + dsgl_ent_len[dstsg])) {

		srclen += (sg_dma_len(src) - srcskip);

		sless = min_t(unsigned int, sg_dma_len(src) - srcskip - soffset,

				CHCR_SRC_SG_SIZE);

		srclen += sless;

		srcsg++;

		srcsg++;

		offset = 0;

		offset = 0;

		while (dst && ((dstsg + 1) <= MAX_DSGL_ENT) &&

		while (dst && ((dstsg + 1) <= MAX_DSGL_ENT) &&
@@ -687,15 +689,20 @@ static int chcr_sg_ent_in_wr(struct scatterlist *src, 
				     dstskip, CHCR_DST_SG_SIZE);

				     dstskip, CHCR_DST_SG_SIZE);

			dstlen += less;

			dstlen += less;

			offset += less;

			offset += less;

			if (offset == sg_dma_len(dst)) {

			if ((offset + dstskip) == sg_dma_len(dst)) {

				dst = sg_next(dst);

				dst = sg_next(dst);

				offset = 0;

				offset = 0;

			}

			}

			dstsg++;

			dstsg++;

			dstskip = 0;

			dstskip = 0;

		}

		}

		soffset += sless;

		if ((soffset + srcskip) == sg_dma_len(src)) {

			src = sg_next(src);

			src = sg_next(src);

			srcskip = 0;

			srcskip = 0;

			soffset = 0;

		}



	}

	}

	return min(srclen, dstlen);

	return min(srclen, dstlen);

}

}