Reset TreeId to zero on SMB2 TREE_CONNECT
authorJan-Marek Glogowski <glogow@fbihome.de>
Mon, 20 Feb 2017 11:25:58 +0000 (12:25 +0100)
committerSteve French <smfrench@gmail.com>
Fri, 7 Apr 2017 13:04:41 +0000 (08:04 -0500)
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>
CC: Stable <stable@vger.kernel.org>
fs/cifs/smb2pdu.c

index 7446496850a3bd5f21fb36e12b65ba5c78532612..66fa1b941cdf02f9d837b077ed1f1de3a0a94a79 100644 (file)
@@ -1185,6 +1185,10 @@ SMB2_tcon(const unsigned int xid, struct cifs_ses *ses, const char *tree,
                return -EINVAL;
        }
 
+       /* SMB2 TREE_CONNECT request must be called with TreeId == 0 */
+       if (tcon)
+               tcon->tid = 0;
+
        rc = small_smb2_init(SMB2_TREE_CONNECT, tcon, (void **) &req);
        if (rc) {
                kfree(unc_path);