From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 25 Jul 2016 01:03:33 +0000 (-0700)
Subject: 4.6-stable patches
X-Git-Tag: v4.6.5~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b373856040421ed4818192e1c65661baef11ecb8;p=thirdparty%2Fkernel%2Fstable-queue.git

4.6-stable patches

added patches:
	crypto-qat-make-qat_asym_algs.o-depend-on-asn1-headers.patch
	crypto-rsa-pkcs1pad-fix-rsa-pkcs1pad-request-struct.patch
---

diff --git a/queue-4.6/crypto-qat-make-qat_asym_algs.o-depend-on-asn1-headers.patch b/queue-4.6/crypto-qat-make-qat_asym_algs.o-depend-on-asn1-headers.patch
new file mode 100644
index 00000000000..104c153cb89
--- /dev/null
+++ b/queue-4.6/crypto-qat-make-qat_asym_algs.o-depend-on-asn1-headers.patch
@@ -0,0 +1,32 @@
+From 81dc0365cfa7bc7c08a0e44d9ee04964df782e19 Mon Sep 17 00:00:00 2001
+From: Jan Stancek <jstancek@redhat.com>
+Date: Thu, 30 Jun 2016 12:23:51 +0200
+Subject: crypto: qat - make qat_asym_algs.o depend on asn1 headers
+
+From: Jan Stancek <jstancek@redhat.com>
+
+commit 81dc0365cfa7bc7c08a0e44d9ee04964df782e19 upstream.
+
+Parallel build can sporadically fail because asn1 headers may
+not be built yet by the time qat_asym_algs.o is compiled:
+  drivers/crypto/qat/qat_common/qat_asym_algs.c:55:32: fatal error: qat_rsapubkey-asn1.h: No such file or directory
+   #include "qat_rsapubkey-asn1.h"
+
+Signed-off-by: Jan Stancek <jstancek@redhat.com>
+Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/crypto/qat/qat_common/Makefile |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/crypto/qat/qat_common/Makefile
++++ b/drivers/crypto/qat/qat_common/Makefile
+@@ -2,6 +2,7 @@ $(obj)/qat_rsapubkey-asn1.o: $(obj)/qat_
+ 			     $(obj)/qat_rsapubkey-asn1.h
+ $(obj)/qat_rsaprivkey-asn1.o: $(obj)/qat_rsaprivkey-asn1.c \
+ 			      $(obj)/qat_rsaprivkey-asn1.h
++$(obj)/qat_asym_algs.o: $(obj)/qat_rsapubkey-asn1.h $(obj)/qat_rsaprivkey-asn1.h
+ 
+ clean-files += qat_rsapubkey-asn1.c qat_rsapubkey-asn1.h
+ clean-files += qat_rsaprivkey-asn1.c qat_rsaprivkey-asn1.h
diff --git a/queue-4.6/crypto-rsa-pkcs1pad-fix-rsa-pkcs1pad-request-struct.patch b/queue-4.6/crypto-rsa-pkcs1pad-fix-rsa-pkcs1pad-request-struct.patch
new file mode 100644
index 00000000000..8023d09588a
--- /dev/null
+++ b/queue-4.6/crypto-rsa-pkcs1pad-fix-rsa-pkcs1pad-request-struct.patch
@@ -0,0 +1,35 @@
+From 87dcdebd6beb54f183ae874664ba47bf071ebf95 Mon Sep 17 00:00:00 2001
+From: Herbert Xu <herbert@gondor.apana.org.au>
+Date: Fri, 22 Jul 2016 17:58:21 +0800
+Subject: crypto: rsa-pkcs1pad - fix rsa-pkcs1pad request struct
+
+From: Herbert Xu <herbert@gondor.apana.org.au>
+
+commit 87dcdebd6beb54f183ae874664ba47bf071ebf95 upstream.
+
+To allow for child request context the struct akcipher_request child_req
+needs to be at the end of the structure.
+
+Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com>
+Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ crypto/rsa-pkcs1pad.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/crypto/rsa-pkcs1pad.c
++++ b/crypto/rsa-pkcs1pad.c
+@@ -102,10 +102,10 @@ struct pkcs1pad_inst_ctx {
+ };
+ 
+ struct pkcs1pad_request {
+-	struct akcipher_request child_req;
+-
+ 	struct scatterlist in_sg[3], out_sg[2];
+ 	uint8_t *in_buf, *out_buf;
++
++	struct akcipher_request child_req;
+ };
+ 
+ static int pkcs1pad_set_pub_key(struct crypto_akcipher *tfm, const void *key,
diff --git a/queue-4.6/series b/queue-4.6/series
index 87fb1a2a730..2fae61c4f71 100644
--- a/queue-4.6/series
+++ b/queue-4.6/series
@@ -197,3 +197,5 @@ acpica-namespace-fix-deadlock-triggered-by-mlc-support-in-dynamic-table-loading.
 xen-acpi-allow-xen-acpi-processor-driver-to-load-on-xen-4.7.patch
 tmpfs-don-t-undo-fallocate-past-its-last-page.patch
 tmpfs-fix-regression-hang-in-fallocate-undo.patch
+crypto-rsa-pkcs1pad-fix-rsa-pkcs1pad-request-struct.patch
+crypto-qat-make-qat_asym_algs.o-depend-on-asn1-headers.patch