From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 23 Feb 2018 16:53:59 +0000 (+0100)
Subject: 4.9-stable patches
X-Git-Tag: v3.18.96~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0c55a46397c817ffd8af49b5167cd65a1f57f767;p=thirdparty%2Fkernel%2Fstable-queue.git

4.9-stable patches

added patches:
	crypto-s5p-sss-fix-kernel-oops-in-aes-ecb-mode.patch
---

diff --git a/queue-4.9/crypto-s5p-sss-fix-kernel-oops-in-aes-ecb-mode.patch b/queue-4.9/crypto-s5p-sss-fix-kernel-oops-in-aes-ecb-mode.patch
new file mode 100644
index 00000000000..f6437b11660
--- /dev/null
+++ b/queue-4.9/crypto-s5p-sss-fix-kernel-oops-in-aes-ecb-mode.patch
@@ -0,0 +1,59 @@
+From c927b080c67e3e97193c81fc1d27f4251bf4e036 Mon Sep 17 00:00:00 2001
+From: Kamil Konieczny <k.konieczny@partner.samsung.com>
+Date: Wed, 7 Feb 2018 16:52:09 +0100
+Subject: crypto: s5p-sss - Fix kernel Oops in AES-ECB mode
+
+From: Kamil Konieczny <k.konieczny@partner.samsung.com>
+
+commit c927b080c67e3e97193c81fc1d27f4251bf4e036 upstream.
+
+In AES-ECB mode crypt is done with key only, so any use of IV
+can cause kernel Oops. Use IV only in AES-CBC and AES-CTR.
+
+Signed-off-by: Kamil Konieczny <k.konieczny@partner.samsung.com>
+Reported-by: Anand Moon <linux.amoon@gmail.com>
+Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
+Tested-by: Anand Moon <linux.amoon@gmail.com>
+Cc: stable@vger.kernel.org # can be applied after commit 8f9702aad138
+Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/crypto/s5p-sss.c |   12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+--- a/drivers/crypto/s5p-sss.c
++++ b/drivers/crypto/s5p-sss.c
+@@ -542,15 +542,21 @@ static void s5p_aes_crypt_start(struct s
+ 	uint32_t aes_control;
+ 	unsigned long flags;
+ 	int err;
++	u8 *iv;
+ 
+ 	aes_control = SSS_AES_KEY_CHANGE_MODE;
+ 	if (mode & FLAGS_AES_DECRYPT)
+ 		aes_control |= SSS_AES_MODE_DECRYPT;
+ 
+-	if ((mode & FLAGS_AES_MODE_MASK) == FLAGS_AES_CBC)
++	if ((mode & FLAGS_AES_MODE_MASK) == FLAGS_AES_CBC) {
+ 		aes_control |= SSS_AES_CHAIN_MODE_CBC;
+-	else if ((mode & FLAGS_AES_MODE_MASK) == FLAGS_AES_CTR)
++		iv = req->info;
++	} else if ((mode & FLAGS_AES_MODE_MASK) == FLAGS_AES_CTR) {
+ 		aes_control |= SSS_AES_CHAIN_MODE_CTR;
++		iv = req->info;
++	} else {
++		iv = NULL; /* AES_ECB */
++	}
+ 
+ 	if (dev->ctx->keylen == AES_KEYSIZE_192)
+ 		aes_control |= SSS_AES_KEY_SIZE_192;
+@@ -581,7 +587,7 @@ static void s5p_aes_crypt_start(struct s
+ 		goto outdata_error;
+ 
+ 	SSS_AES_WRITE(dev, AES_CONTROL, aes_control);
+-	s5p_set_aes(dev, dev->ctx->aes_key, req->info, dev->ctx->keylen);
++	s5p_set_aes(dev, dev->ctx->aes_key, iv, dev->ctx->keylen);
+ 
+ 	s5p_set_dma_indata(dev,  dev->sg_src);
+ 	s5p_set_dma_outdata(dev, dev->sg_dst);
diff --git a/queue-4.9/series b/queue-4.9/series
index 4a35bf75127..7525f96bde8 100644
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -142,3 +142,4 @@ x86-microcode-amd-change-load_microcode_amd-s-param-to-bool-to-fix-preemptibilit
 kvm-async_pf-fix-df-due-to-inject-page-not-present-and-page-ready-exceptions-simultaneously.patch
 kvm-vmx-clean-up-declaration-of-vpid-ept-invalidation-types.patch
 kvm-nvmx-invvpid-handling-improvements.patch
+crypto-s5p-sss-fix-kernel-oops-in-aes-ecb-mode.patch