Commit fd27b571 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Herbert Xu

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: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: default avatarOndrej Mosnacek <omosnace@redhat.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 5155e118
...@@ -122,10 +122,9 @@ static int next_index(u32 *counter) ...@@ -122,10 +122,9 @@ static int next_index(u32 *counter)
int i, res = 0; int i, res = 0;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
if (counter[i] + 1 != 0) { if (counter[i] + 1 != 0)
res += ffz(counter[i]++); return res + ffz(counter[i]++);
break;
}
counter[i] = 0; counter[i] = 0;
res += 32; res += 32;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment