Skip to contentSkip to conversation

Patch "crypto: arm64/aes-xts-ce: fix for big endian" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Jan 9, 2017

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

crypto: arm64/aes-xts-ce: fix for big endian

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
crypto-arm64-aes-xts-ce-fix-for-big-endian.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From caf4b9e2b326cc2a5005a5c557274306536ace61 Mon Sep 17 00:00:00 2001

From: Ard Biesheuvel <[email protected]>
Date: Tue, 11 Oct 2016 19:15:19 +0100
Subject: crypto: arm64/aes-xts-ce: fix for big endian

From: Ard Biesheuvel <[email protected]>

commit caf4b9e2b326cc2a5005a5c557274306536ace61 upstream.

Emit the XTS tweak literal constants in the appropriate order for a single 128-bit scalar literal load.

Fixes 49788fe2a128 ("arm64/crypto: AES-ECB/CBC/CTR/XTS using ARMv8 NEON and Crypto Extensions")
---
 arch/arm64/crypto/aes-ce.S    |    1 +
 arch/arm64/crypto/aes-modes.S |    3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
arch/arm64/crypto/aes-ce.S +1 -0
@@ -10,6 +10,7 @@
  */
 
 #include <linux/linkage.h>
+#include <asm/assembler.h>
 
 #define AES_ENTRY(func)		ENTRY(ce_ ## func)
 #define AES_ENDPROC(func)	ENDPROC(ce_ ## func)
arch/arm64/crypto/aes-modes.S +2 -1
@@ -386,7 +386,8 @@ AES_ENDPROC(aes_ctr_encrypt)
 	.endm
 
 .Lxts_mul_x:
-	.word		1, 0, 0x87, 0
+CPU_LE(	.quad		1, 0x87		)
+CPU_BE(	.quad		0x87, 1		)
 
 AES_ENTRY(aes_xts_encrypt)
 	FRAME_PUSH

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/crypto-arm64-aes-neon-fix-for-big-endian.patch queue-4.4/crypto-arm64-ghash-ce-fix-for-big-endian.patch queue-4.4/crypto-arm64-aes-ce-fix-for-big-endian.patch queue-4.4/crypto-arm64-aes-xts-ce-fix-for-big-endian.patch queue-4.4/crypto-arm-aes-ce-fix-for-big-endian.patch queue-4.4/crypto-arm64-aes-ccm-ce-fix-for-big-endian.patch queue-4.4/crypto-arm64-sha2-ce-fix-for-big-endian.patch queue-4.4/crypto-arm64-sha1-ce-fix-for-big-endian.patch