Patch "cifs: unbreak TCP session reuse" has been added to the 4.7-stable tree

This is a note to let you know that I've just added the patch titled

cifs: unbreak TCP session reuse

to the 4.7-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
cifs-unbreak-tcp-session-reuse.patch
and it can be found in the queue-4.7 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Rabin Vincent <[email protected]>
Date: Tue, 19 Jul 2016 09:25:45 +0200
Subject: cifs: unbreak TCP session reuse

From: Rabin Vincent <[email protected]>

commit b782fcc1cbeb7e336c0ed1f00004b2208f48ffe0 upstream.

adfeb3e0 ("cifs: Make echo interval tunable") added a comparison of vol->echo_interval to server->echo_interval as a criterium to match_server(), but:

(1) A default value is set for server->echo_interval but not for vol->echo_interval, meaning these can never match if the echo_interval option is not specified.

(2) vol->echo_interval is in seconds but server->echo_interval is in jiffies, meaning these can never match even if the echo_interval option is specified.

This broke TCP session reuse since match_server() can never return 1. Fix it.

---
 fs/cifs/connect.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

@@ -1228,6 +1228,8 @@ cifs_parse_mount_options(const char *mou
 	vol->ops = &smb1_operations;
 	vol->vals = &smb1_values;
 
+	vol->echo_interval = SMB_ECHO_INTERVAL_DEFAULT;
+
 	if (!mountdata)
 		goto cifs_parse_mount_err;
 

@@ -2049,7 +2051,7 @@ static int match_server(struct TCP_Serve
 	if (!match_security(server, vol))
 		return 0;
 
-	if (server->echo_interval != vol->echo_interval)
+	if (server->echo_interval != vol->echo_interval * HZ)
 		return 0;
 
 	return 1;

Patches currently in stable-queue which might be from [email protected] are

queue-4.7/cifs-unbreak-tcp-session-reuse.patch queue-4.7/cifs-fix-crash-due-to-race-in-hmac-md5-handling.patch