From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 4 Mar 2016 01:42:09 +0000 (-0800)
Subject: 3.10-stable patches
X-Git-Tag: v3.10.100~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cbe2f8240918df8907112188709dbff527e468ae;p=thirdparty%2Fkernel%2Fstable-queue.git

3.10-stable patches

added patches:
	cifs-fix-smb2-interim-response-processing-for-read-requests.patch
---

diff --git a/queue-3.10/cifs-fix-smb2-interim-response-processing-for-read-requests.patch b/queue-3.10/cifs-fix-smb2-interim-response-processing-for-read-requests.patch
new file mode 100644
index 00000000000..f6d3cfb48f6
--- /dev/null
+++ b/queue-3.10/cifs-fix-smb2-interim-response-processing-for-read-requests.patch
@@ -0,0 +1,72 @@
+From 6cc3b24235929b54acd5ecc987ef11a425bd209e Mon Sep 17 00:00:00 2001
+From: Pavel Shilovsky <pshilovsky@samba.org>
+Date: Sat, 27 Feb 2016 11:58:18 +0300
+Subject: CIFS: Fix SMB2+ interim response processing for read requests
+
+From: Pavel Shilovsky <pshilovsky@samba.org>
+
+commit 6cc3b24235929b54acd5ecc987ef11a425bd209e upstream.
+
+For interim responses we only need to parse a header and update
+a number credits. Now it is done for all SMB2+ command except
+SMB2_READ which is wrong. Fix this by adding such processing.
+
+Signed-off-by: Pavel Shilovsky <pshilovsky@samba.org>
+Tested-by: Shirish Pargaonkar <shirishpargaonkar@gmail.com>
+Signed-off-by: Steve French <smfrench@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ fs/cifs/cifssmb.c |   21 ++++++++++++++++++---
+ 1 file changed, 18 insertions(+), 3 deletions(-)
+
+--- a/fs/cifs/cifssmb.c
++++ b/fs/cifs/cifssmb.c
+@@ -1389,11 +1389,10 @@ openRetry:
+  * current bigbuf.
+  */
+ static int
+-cifs_readv_discard(struct TCP_Server_Info *server, struct mid_q_entry *mid)
++discard_remaining_data(struct TCP_Server_Info *server)
+ {
+ 	unsigned int rfclen = get_rfc1002_length(server->smallbuf);
+ 	int remaining = rfclen + 4 - server->total_read;
+-	struct cifs_readdata *rdata = mid->callback_data;
+ 
+ 	while (remaining > 0) {
+ 		int length;
+@@ -1407,10 +1406,20 @@ cifs_readv_discard(struct TCP_Server_Inf
+ 		remaining -= length;
+ 	}
+ 
+-	dequeue_mid(mid, rdata->result);
+ 	return 0;
+ }
+ 
++static int
++cifs_readv_discard(struct TCP_Server_Info *server, struct mid_q_entry *mid)
++{
++	int length;
++	struct cifs_readdata *rdata = mid->callback_data;
++
++	length = discard_remaining_data(server);
++	dequeue_mid(mid, rdata->result);
++	return length;
++}
++
+ int
+ cifs_readv_receive(struct TCP_Server_Info *server, struct mid_q_entry *mid)
+ {
+@@ -1439,6 +1448,12 @@ cifs_readv_receive(struct TCP_Server_Inf
+ 		return length;
+ 	server->total_read += length;
+ 
++	if (server->ops->is_status_pending &&
++	    server->ops->is_status_pending(buf, server, 0)) {
++		discard_remaining_data(server);
++		return -1;
++	}
++
+ 	/* Was the SMB read successful? */
+ 	rdata->result = server->ops->map_error(buf, false);
+ 	if (rdata->result != 0) {
diff --git a/queue-3.10/series b/queue-3.10/series
index 22cc8053399..cf9c8c25bc3 100644
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -1,2 +1,3 @@
 locks-fix-unlock-when-fcntl_setlk-races-with-a-close.patch
 edac-mc_sysfs-fix-freeing-bus-name.patch
+cifs-fix-smb2-interim-response-processing-for-read-requests.patch