Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2afb814 authored by Steve French's avatar Steve French
Browse files

Set previous session id correctly on SMB3 reconnect 



Signed-off-by: default avatarSteve French <steve.french@primarydata.com>
CC: Stable <stable@vger.kernel.org>
Reported-by: default avatarDavid Goebel <davidgoe@microsoft.com>
parent 7d414f39

fs/cifs/smb2pdu.c

+5 −0
Original line number Diff line number Diff line
@@ -604,6 +604,7 @@ SMB2_sess_setup(const unsigned int xid, struct cifs_ses *ses, 
	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");
@@ -641,6 +642,10 @@ SMB2_sess_setup(const unsigned int xid, struct cifs_ses *ses, 
		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
Original line number Diff line number Diff line
@@ -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;