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

Commit 934fc24d authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Russell King
Browse files

ARM: 7723/1: crypto: sha1-armv4-large.S: fix SP handling 

Make the SHA1 asm code ABI conformant by making sure all stack
accesses occur above the stack pointer.

Origin:
http://git.openssl.org/gitweb/?p=openssl.git;a=commit;h=1a9d60d2



Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Acked-by: default avatarNicolas Pitre <nico@linaro.org>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent c7788792

arch/arm/crypto/sha1-armv4-large.S

+1 −1
Original line number Diff line number Diff line
@@ -195,6 +195,7 @@ ENTRY(sha1_block_data_order) 
	add	r3,r3,r10			@ E+=F_00_19(B,C,D)

	cmp	r14,sp

	bne	.L_00_15		@ [((11+4)*5+2)*3]

	sub	sp,sp,#25*4

#if __ARM_ARCH__<7

	ldrb	r10,[r1,#2]

	ldrb	r9,[r1,#3]
@@ -290,7 +291,6 @@ ENTRY(sha1_block_data_order) 
	add	r3,r3,r10			@ E+=F_00_19(B,C,D)



	ldr	r8,.LK_20_39		@ [+15+16*4]

	sub	sp,sp,#25*4

	cmn	sp,#0			@ [+3], clear carry to denote 20_39

.L_20_39_or_60_79:

	ldr	r9,[r14,#15*4]