Commit fd27b571 authored Sep 30, 2018 by Ard Biesheuvel Committed by Herbert Xu Oct 05, 2018

crypto: lrw - fix rebase error after out of bounds fix



Due to an unfortunate interaction between commit fbe1a850
("crypto: lrw - Fix out-of bounds access on counter overflow") and
commit c778f96b ("crypto: lrw - Optimize tweak computation"),
we ended up with a version of next_index() that always returns 127.

Fixes: c778f96b ("crypto: lrw - Optimize tweak computation")
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Ondrej Mosnacek <omosnace@redhat.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

parent 5155e118

crypto/lrw.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -122,10 +122,9 @@ static int next_index(u32 *counter)
		int i, res = 0;

		for (i = 0; i < 4; i++) {
		if (counter[i] + 1 != 0) {
		res += ffz(counter[i]++);
		break;
		}
		if (counter[i] + 1 != 0)
		return res + ffz(counter[i]++);

		counter[i] = 0;
		res += 32;
		}

Admin message