Commit c4768993 authored Jan 27, 2015 by Cristian Stoica Committed by Herbert Xu Feb 04, 2015

crypto: tcrypt - fix buflen reminder calculation



- This fixes the intent of the code to limit the last scatterlist to
  either a full PAGE or a fraction of it, depending on the number of
  pages needed by buflen and the available space advertised by XBUFLEN.

  The original code always sets the last scatterlist to a fraction of a
  PAGE because the first 'if' is never executed.

- Rearrange the second part of the code to remove the conditional from
  the loop

Signed-off-by: Cristian Stoica <cristian.stoica@freescale.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

parent db71f29a

crypto/tcrypt.c

+8 −8

Original line number	Diff line number	Diff line
		@@ -250,19 +250,19 @@ static void sg_init_aead(struct scatterlist sg, char xbuf[XBUFSIZE],
		int np = (buflen + PAGE_SIZE - 1)/PAGE_SIZE;
		int k, rem;

		np = (np > XBUFSIZE) ? XBUFSIZE : np;
		rem = buflen % PAGE_SIZE;
		if (np > XBUFSIZE) {
		rem = PAGE_SIZE;
		np = XBUFSIZE;
		} else {
		rem = buflen % PAGE_SIZE;
		}

		sg_init_table(sg, np);
		for (k = 0; k < np; ++k) {
		if (k == (np-1))
		sg_set_buf(&sg[k], xbuf[k], rem);
		else
		np--;
		for (k = 0; k < np; k++)
		sg_set_buf(&sg[k], xbuf[k], PAGE_SIZE);
		}

		sg_set_buf(&sg[k], xbuf[k], rem);
		}

		static void test_aead_speed(const char *algo, int enc, unsigned int secs,

Admin message