[PATCH] Reset TreeId to zero on SMB2 TREE_CONNECT

[PATCH] Reset TreeId to zero on SMB2 TREE_CONNECT

[Jan-Marek Glogowski]

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-iG8UcmBuX++ELgA04lAiVw@public.gmane.org>
Reviewed-by: Aurelien Aptel <aaptel-IBi9RG/b67k@public.gmane.org>
Tested-by: Aurelien Aptel <aaptel-IBi9RG/b67k@public.gmane.org>
---
 fs/cifs/smb2pdu.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
index 8745722..bdd3292 100644
--- a/fs/cifs/smb2pdu.c
+++ b/fs/cifs/smb2pdu.c
@@ -1104,6 +1104,10 @@ static inline void init_copy_chunk_defaults(struct cifs_tcon *tcon)
 		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);
-- 
1.9.1

Re: [PATCH] Reset TreeId to zero on SMB2 TREE_CONNECT

[Jan-Marek Glogowski]

Hi everyone,

just replying to my own patch mail.

The patch is now pending for a month. I saw other stuff picked up for
linux-next and wondered, if it was missing something?

The patch was developed with the help of Aurelien Aptel, originally in
the "Fix SMB2_TREE_CONNECT requests with the wrong TreeId" thread
starting 2017-02-10.

There is a bug report with an attached trace and my debug scripts at
https://bugzilla.samba.org/show_bug.cgi?id=12584

Best regards,

Jan-Marek Glogowski

Re: [PATCH] Reset TreeId to zero on SMB2 TREE_CONNECT

[Steve French]

I plan to merge this

On Thu, Mar 23, 2017 at 1:17 PM, Jan-Marek Glogowski <glogow-iG8UcmBuX++ELgA04lAiVw@public.gmane.org> wrote:
> Hi everyone,
>
> just replying to my own patch mail.
>
> The patch is now pending for a month. I saw other stuff picked up for
> linux-next and wondered, if it was missing something?
>
> The patch was developed with the help of Aurelien Aptel, originally in
> the "Fix SMB2_TREE_CONNECT requests with the wrong TreeId" thread
> starting 2017-02-10.
>
> There is a bug report with an attached trace and my debug scripts at
> https://bugzilla.samba.org/show_bug.cgi?id=12584
>
> Best regards,
>
> Jan-Marek Glogowski
> --
> To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html



-- 
Thanks,

Steve