Skip to content

Commit 5a69c2b

Browse files
jmglogowgregkh
authored andcommitted
Reset TreeId to zero on SMB2 TREE_CONNECT
commit 806a28efe9b78ffae5e2757e1ee924b8e50c08ab upstream. Currently the cifs module breaks the CIFS specs on reconnect as described in http://msdn.microsoft.com/en-us/library/cc246529.aspx: "TreeId (4 bytes): Uniquely identifies the tree connect for the command. This MUST be 0 for the SMB2 TREE_CONNECT Request." Signed-off-by: Jan-Marek Glogowski <glogow@fbihome.de> Reviewed-by: Aurelien Aptel <aaptel@suse.com> Tested-by: Aurelien Aptel <aaptel@suse.com> Signed-off-by: Steve French <smfrench@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 8ff7eb4 commit 5a69c2b

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

fs/cifs/smb2pdu.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -952,6 +952,10 @@ SMB2_tcon(const unsigned int xid, struct cifs_ses *ses, const char *tree,
952952
return -EINVAL;
953953
}
954954

955+
/* SMB2 TREE_CONNECT request must be called with TreeId == 0 */
956+
if (tcon)
957+
tcon->tid = 0;
958+
955959
rc = small_smb2_init(SMB2_TREE_CONNECT, tcon, (void **) &req);
956960
if (rc) {
957961
kfree(unc_path);

0 commit comments

Comments
 (0)