Skip to contentSkip to conversation

Patch "Set previous session id correctly on SMB3 reconnect" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Oct 26, 2016 Stable branch

lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

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

Set previous session id correctly on SMB3 reconnect

to the 4.4-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:
set-previous-session-id-correctly-on-smb3-reconnect.patch
and it can be found in the queue-4.4 subdirectory.

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

Quoted 1 line

From c2afb8147e69819885493edf3a7c1ce03aaf2d4e Mon Sep 17 00:00:00 2001

From: Steve French <[email protected]>
Date: Tue, 20 Sep 2016 22:56:13 -0500
Subject: Set previous session id correctly on SMB3 reconnect

From: Steve French <[email protected]>

commit c2afb8147e69819885493edf3a7c1ce03aaf2d4e upstream.

---
 fs/cifs/smb2pdu.c |    5 +++++
 fs/cifs/smb2pdu.h |    2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
fs/cifs/smb2pdu.c +5 -0
@@ -607,6 +607,7 @@ SMB2_sess_setup(const unsigned int xid,
 	char *security_blob = NULL;
 	unsigned char *ntlmssp_blob = NULL;
 	bool use_spnego = false; /* else use raw ntlmssp */
+	u64 previous_session = ses->Suid;
 
 	cifs_dbg(FYI, "Session Setup\n");
 
@@ -644,6 +645,10 @@ ssetup_ntlmssp_authenticate:
 		return rc;
 
 	req->hdr.SessionId = 0; /* First session, not a reauthenticate */
+
+	/* if reconnect, we need to send previous sess id, otherwise it is 0 */
+	req->PreviousSessionId = previous_session;
+
 	req->Flags = 0; /* MBZ */
 	/* to enable echos and oplocks */
 	req->hdr.CreditRequest = cpu_to_le16(3);
fs/cifs/smb2pdu.h +1 -1
@@ -276,7 +276,7 @@ struct smb2_sess_setup_req {
 	__le32 Channel;
 	__le16 SecurityBufferOffset;
 	__le16 SecurityBufferLength;
-	__le64 PreviousSessionId;
+	__u64 PreviousSessionId;
 	__u8   Buffer[1];	/* variable length GSS security buffer */
 } __packed;
 

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

queue-4.4/fix-regression-which-breaks-dfs-mounting.patch queue-4.4/cleanup-missing-frees-on-some-ioctls.patch queue-4.4/smb3-guids-should-be-constructed-as-random-but-valid-uuids.patch queue-4.4/clarify-locking-of-cifs-file-and-tcon-structures-and-make-more-granular.patch queue-4.4/do-not-send-smb3-set_info-request-if-nothing-is-changing.patch queue-4.4/set-previous-session-id-correctly-on-smb3-reconnect.patch queue-4.4/cifs-limit-the-overall-credit-acquired.patch queue-4.4/fs-cifs-keep-guid-when-assigning-fid-to-fileinfo.patch queue-4.4/display-number-of-credits-available.patch