From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 7 Feb 2017 16:18:41 +0000 (+0100)
Subject: 3.18-stable patches
X-Git-Tag: v3.18.48~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=748d963afa1b74945a852f7003f2a7d5418b5b10;p=thirdparty%2Fkernel%2Fstable-queue.git

3.18-stable patches

added patches:
	fix-crypto-algif_hash-require-setkey-before-accept-2.patch
---

diff --git a/queue-3.18/fix-crypto-algif_hash-require-setkey-before-accept-2.patch b/queue-3.18/fix-crypto-algif_hash-require-setkey-before-accept-2.patch
new file mode 100644
index 00000000000..51d20cf2f2d
--- /dev/null
+++ b/queue-3.18/fix-crypto-algif_hash-require-setkey-before-accept-2.patch
@@ -0,0 +1,45 @@
+From foo@baz Thu Feb  2 22:54:08 CET 2017
+Date: Thu, 02 Feb 2017 22:54:08 +0100
+To: Greg KH <gregkh@linuxfoundation.org>
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Subject: Fix "crypto: algif_hash - Require setkey before accept(2)"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+Fix up commit cec8983e6d2cf52e60cd59583ae30f81f923f563 which was commit
+6de62f15b581f920ade22d758f4c338311c2f0d4 upstream.
+
+The function prototypes were wrong.  Someone was ignoring compiler
+warnings :(
+
+Cc: Sasha Levin <alexander.levin@verizon.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ crypto/algif_hash.c |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/crypto/algif_hash.c
++++ b/crypto/algif_hash.c
+@@ -283,8 +283,8 @@ unlock_child:
+ 	return err;
+ }
+ 
+-static int hash_sendmsg_nokey(struct socket *sock, struct msghdr *msg,
+-			      size_t size)
++static int hash_sendmsg_nokey(struct kiocb *unused, struct socket *sock,
++			      struct msghdr *msg, size_t size)
+ {
+ 	int err;
+ 
+@@ -307,8 +307,8 @@ static ssize_t hash_sendpage_nokey(struc
+ 	return hash_sendpage(sock, page, offset, size, flags);
+ }
+ 
+-static int hash_recvmsg_nokey(struct socket *sock, struct msghdr *msg,
+-			      size_t ignored, int flags)
++static int hash_recvmsg_nokey(struct kiocb *unused, struct socket *sock,
++			      struct msghdr *msg, size_t ignored, int flags)
+ {
+ 	int err;
+ 
diff --git a/queue-3.18/series b/queue-3.18/series
index c0dd374f5e6..69d3c6eb0f0 100644
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -29,3 +29,4 @@ spi-dw-mid-refactor-to-use-helpers.patch
 blk-rq_data_dir-should-not-return-a-boolean.patch
 net-add-sysctl_max_skb_frags.patch
 drm-i915-cleanup-some-indenting.patch
+fix-crypto-algif_hash-require-setkey-before-accept-2.patch