Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-10 15:10:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Browse Source 
Pull crypto fix from Herbert Xu:
 "Fix a regression that causes sha-mb to crash"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: sha1-mb - make sha1_x8_avx2() conform to C function ABI
This commit is contained in:
Linus Torvalds 2016-05-20 10:25:16 -07:00
commit e4fba88d00
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arch/x86/crypto/sha-mb/sha1_x8_avx2.S
View File

@ -296,7 +296,11 @@ W14 = TMP_
# #
ENTRY(sha1_x8_avx2) ENTRY(sha1_x8_avx2)
push RSP_SAVE # save callee-saved clobbered registers to comply with C function ABI
push %r12
push %r13
push %r14
push %r15
#save rsp #save rsp
mov %rsp, RSP_SAVE mov %rsp, RSP_SAVE
@ -446,7 +450,12 @@ lloop:
## Postamble ## Postamble
mov RSP_SAVE, %rsp mov RSP_SAVE, %rsp
pop RSP_SAVE
# restore callee-saved clobbered registers
pop %r15
pop %r14
pop %r13
pop %r12
ret ret
ENDPROC(sha1_x8_avx2) ENDPROC(sha1_x8_avx2)