AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

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

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

Fixes: c778f96bf3 ("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>
This commit is contained in:
Ard Biesheuvel 2018-09-30 21:51:16 +02:00 committed by Herbert Xu
parent 5155e118dd
commit fd27b571c9
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crypto/lrw.c
View File

@ -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;
} }