diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-09-29 07:37:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-09-29 07:37:46 -0700 |
| commit | 6e439bbd436e39f15abc9587cdd23d56257780cb (patch) | |
| tree | c511811d461bf387d1218e1cd089e6c5c1fa9da1 /arch/x86 | |
| parent | a4e6f95a891ac08bd09d62e3e6dae239b150f4c1 (diff) | |
| parent | 0e14ef38669ce4faa80589247fe8ed8a3780f414 (diff) | |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"This contains fixes for a resource leak in ccp as well as stack
corruption in x86/sm4"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: x86/sm4 - Fix frame pointer stack corruption
crypto: ccp - fix resource leaks in ccp_run_aes_gcm_cmd()
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/crypto/sm4-aesni-avx-asm_64.S | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/crypto/sm4-aesni-avx-asm_64.S b/arch/x86/crypto/sm4-aesni-avx-asm_64.S index fa2c3f50aecb..18d2f5199194 100644 --- a/arch/x86/crypto/sm4-aesni-avx-asm_64.S +++ b/arch/x86/crypto/sm4-aesni-avx-asm_64.S @@ -367,10 +367,11 @@ SYM_FUNC_START(sm4_aesni_avx_crypt8) * %rdx: src (1..8 blocks) * %rcx: num blocks (1..8) */ - FRAME_BEGIN - cmpq $5, %rcx; jb sm4_aesni_avx_crypt4; + + FRAME_BEGIN + vmovdqu (0 * 16)(%rdx), RA0; vmovdqu (1 * 16)(%rdx), RA1; vmovdqu (2 * 16)(%rdx), RA2; |