From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 20 Jun 2019 14:08:54 +0000 (+0200)
Subject: 4.4-stable patches
X-Git-Tag: v5.1.13~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=06dd909745bb38c0e14d8a6ab7b5a5e8a4e7f134;p=thirdparty%2Fkernel%2Fstable-queue.git

4.4-stable patches

added patches:
	revert-crypto-crypto4xx-properly-set-iv-after-de-and-encrypt.patch
---

diff --git a/queue-4.4/revert-crypto-crypto4xx-properly-set-iv-after-de-and-encrypt.patch b/queue-4.4/revert-crypto-crypto4xx-properly-set-iv-after-de-and-encrypt.patch
new file mode 100644
index 00000000000..de18e1b9adb
--- /dev/null
+++ b/queue-4.4/revert-crypto-crypto4xx-properly-set-iv-after-de-and-encrypt.patch
@@ -0,0 +1,52 @@
+From dcc685012c89d769336806671e806ecaaaa994db Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Thu, 20 Jun 2019 16:05:57 +0200
+Subject: Revert "crypto: crypto4xx - properly set IV after de- and encrypt"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit e9a60ab1609a7d975922adad1bf9c46ac6954584 which is
+commit fc340115ffb8235c1bbd200c28855e6373d0dd1a upstream.
+
+Hauke writes that this breaks the build and should be reverted.
+
+Reported-by: Hauke Mehrtens <hauke@hauke-m.de>
+Cc: Christian Lamparter <chunkeey@gmail.com>
+Cc: Herbert Xu <herbert@gondor.apana.org.au>
+Cc: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/crypto/amcc/crypto4xx_alg.c  |    3 +--
+ drivers/crypto/amcc/crypto4xx_core.c |    9 ---------
+ 2 files changed, 1 insertion(+), 11 deletions(-)
+
+--- a/drivers/crypto/amcc/crypto4xx_alg.c
++++ b/drivers/crypto/amcc/crypto4xx_alg.c
+@@ -138,8 +138,7 @@ static int crypto4xx_setkey_aes(struct c
+ 	sa = (struct dynamic_sa_ctl *) ctx->sa_in;
+ 	ctx->hash_final = 0;
+ 
+-	set_dynamic_sa_command_0(sa, SA_NOT_SAVE_HASH, (cm == CRYPTO_MODE_CBC ?
+-				 SA_SAVE_IV : SA_NOT_SAVE_IV),
++	set_dynamic_sa_command_0(sa, SA_NOT_SAVE_HASH, SA_NOT_SAVE_IV,
+ 				 SA_LOAD_HASH_FROM_SA, SA_LOAD_IV_FROM_STATE,
+ 				 SA_NO_HEADER_PROC, SA_HASH_ALG_NULL,
+ 				 SA_CIPHER_ALG_AES, SA_PAD_TYPE_ZERO,
+--- a/drivers/crypto/amcc/crypto4xx_core.c
++++ b/drivers/crypto/amcc/crypto4xx_core.c
+@@ -645,15 +645,6 @@ static u32 crypto4xx_ablkcipher_done(str
+ 		addr = dma_map_page(dev->core_dev->device, sg_page(dst),
+ 				    dst->offset, dst->length, DMA_FROM_DEVICE);
+ 	}
+-
+-	if (pd_uinfo->sa_va->sa_command_0.bf.save_iv == SA_SAVE_IV) {
+-		struct crypto_skcipher *skcipher = crypto_skcipher_reqtfm(req);
+-
+-		crypto4xx_memcpy_from_le32((u32 *)req->iv,
+-			pd_uinfo->sr_va->save_iv,
+-			crypto_skcipher_ivsize(skcipher));
+-	}
+-
+ 	crypto4xx_ret_sg_desc(dev, pd_uinfo);
+ 	if (ablk_req->base.complete != NULL)
+ 		ablk_req->base.complete(&ablk_req->base, 0);
diff --git a/queue-4.4/series b/queue-4.4/series
index d81effea83b..672cdd428e4 100644
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -79,3 +79,4 @@ kvm-ppc-book3s-use-new-mutex-to-synchronize-access-t.patch
 net-sh_eth-fix-mdio-access-in-sh_eth_close-for-r-car.patch
 scsi-libcxgbi-add-a-check-for-null-pointer-in-cxgbi_.patch
 scsi-libsas-delete-sas-port-if-expander-discover-fai.patch
+revert-crypto-crypto4xx-properly-set-iv-after-de-and-encrypt.patch