diff options
| author | Eric Biggers <ebiggers@google.com> | 2019-01-09 07:12:41 +0100 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2019-01-10 14:37:32 +0100 |
| commit | d45a90cb5d061fa7d411b974b950fe0b8bc5f265 (patch) | |
| tree | 49032700a8eaadb4eac60f5812202c9a22bd1991 /crypto | |
| parent | crypto: talitos - fix ablkcipher for CONFIG_VMAP_STACK (diff) | |
| download | linux-d45a90cb5d061fa7d411b974b950fe0b8bc5f265.tar.xz linux-d45a90cb5d061fa7d411b974b950fe0b8bc5f265.zip | |
crypto: sm3 - fix undefined shift by >= width of value
sm3_compress() calls rol32() with shift >= 32, which causes undefined
behavior. This is easily detected by enabling CONFIG_UBSAN.
Explicitly AND with 31 to make the behavior well defined.
Fixes: 4f0fc1600edb ("crypto: sm3 - add OSCCA SM3 secure hash")
Cc: <stable@vger.kernel.org> # v4.15+
Cc: Gilad Ben-Yossef <gilad@benyossef.com>
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/sm3_generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/sm3_generic.c b/crypto/sm3_generic.c index 9a5c60f08aad..c0cf87ae7ef6 100644 --- a/crypto/sm3_generic.c +++ b/crypto/sm3_generic.c @@ -100,7 +100,7 @@ static void sm3_compress(u32 *w, u32 *wt, u32 *m) for (i = 0; i <= 63; i++) { - ss1 = rol32((rol32(a, 12) + e + rol32(t(i), i)), 7); + ss1 = rol32((rol32(a, 12) + e + rol32(t(i), i & 31)), 7); ss2 = ss1 ^ rol32(a, 12); |