diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-10 14:30:57 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-10 14:30:57 -0400 |
| commit | 9ab6e6e7db3027728067a827b2366b2aca4f519d (patch) | |
| tree | 69e65f504b0a0f73d21a28b37ea076b84549156f /arch/x86 | |
| parent | 4f440cd534359f689cb577c68f8491d1eddf0b76 (diff) | |
| parent | 0378c9a855bfa395f595fbfb049707093e270f69 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"This push fixes an error in sha512_ssse3 that leads to incorrect
output as well as a memory leak in caam_jr when the module is
unloaded"
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: caam - fix memleak in caam_jr module
crypto: sha512_ssse3 - fix byte count to bit count conversion
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/crypto/sha512_ssse3_glue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/crypto/sha512_ssse3_glue.c b/arch/x86/crypto/sha512_ssse3_glue.c index f30cd10293f0..8626b03e83b7 100644 --- a/arch/x86/crypto/sha512_ssse3_glue.c +++ b/arch/x86/crypto/sha512_ssse3_glue.c | |||
| @@ -141,7 +141,7 @@ static int sha512_ssse3_final(struct shash_desc *desc, u8 *out) | |||
| 141 | 141 | ||
| 142 | /* save number of bits */ | 142 | /* save number of bits */ |
| 143 | bits[1] = cpu_to_be64(sctx->count[0] << 3); | 143 | bits[1] = cpu_to_be64(sctx->count[0] << 3); |
| 144 | bits[0] = cpu_to_be64(sctx->count[1] << 3) | sctx->count[0] >> 61; | 144 | bits[0] = cpu_to_be64(sctx->count[1] << 3 | sctx->count[0] >> 61); |
| 145 | 145 | ||
| 146 | /* Pad out to 112 mod 128 and append length */ | 146 | /* Pad out to 112 mod 128 and append length */ |
| 147 | index = sctx->count[0] & 0x7f; | 147 | index = sctx->count[0] & 0x7f; |