Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1960e8ea authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull crypto fix from Herbert Xu:
 "This fixes an objtool regression"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: x86/chacha20 - satisfy stack validation 2.0
parents 0b07194b 4635742d

arch/x86/crypto/chacha20-avx2-x86_64.S

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ ENTRY(chacha20_8block_xor_avx2) 


	vzeroupper

	# 4 * 32 byte stack, 32-byte aligned

	mov		%rsp, %r8

	lea		8(%rsp),%r10

	and		$~31, %rsp

	sub		$0x80, %rsp
@@ -443,6 +443,6 @@ ENTRY(chacha20_8block_xor_avx2) 
	vmovdqu		%ymm15,0x01e0(%rsi)



	vzeroupper

	mov		%r8,%rsp

	lea		-8(%r10),%rsp

	ret

ENDPROC(chacha20_8block_xor_avx2)

arch/x86/crypto/chacha20-ssse3-x86_64.S

+2 −2
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ ENTRY(chacha20_4block_xor_ssse3) 
	# done with the slightly better performing SSSE3 byte shuffling,

	# 7/12-bit word rotation uses traditional shift+OR.



	mov		%rsp,%r11

	lea		8(%rsp),%r10

	sub		$0x80,%rsp

	and		$~63,%rsp
@@ -625,6 +625,6 @@ ENTRY(chacha20_4block_xor_ssse3) 
	pxor		%xmm1,%xmm15

	movdqu		%xmm15,0xf0(%rsi)



	mov		%r11,%rsp

	lea		-8(%r10),%rsp

	ret

ENDPROC(chacha20_4block_xor_ssse3)