diff options
| author | Steve French <smfrench@gmail.com> | 2014-05-13 13:37:45 -0700 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-06-27 10:25:19 +0200 |
| commit | c82b3dd92c24207c8c0d6b4334a53e1245cc13d6 (patch) | |
| tree | 3479d410f829196354f25fd064864883d672ef45 | |
| parent | 8f7e86ca1df5a1766b9566540a62ff2804104bd4 (diff) | |
Do not send ClientGUID on SMB2.02 dialect
commit 3c5f9be108783c05cade918d29c8711b236acb1d upstream.
ClientGUID must be zero for SMB2.02 dialect. See section 2.2.3
of MS-SMB2. For SMB2.1 and later it must be non-zero.
Signed-off-by: Steve French <smfrench@gmail.com>
CC: Sachin Prabhu <sprabhu@redhat.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | fs/cifs/smb2pdu.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c index 37de258d9a34..5818d2ca66f1 100644 --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c @@ -375,7 +375,12 @@ SMB2_negotiate(const unsigned int xid, struct cifs_ses *ses) req->Capabilities = cpu_to_le32(ses->server->vals->req_capabilities); - memcpy(req->ClientGUID, server->client_guid, SMB2_CLIENT_GUID_SIZE); + /* ClientGUID must be zero for SMB2.02 dialect */ + if (ses->server->vals->protocol_id == SMB20_PROT_ID) + memset(req->ClientGUID, 0, SMB2_CLIENT_GUID_SIZE); + else + memcpy(req->ClientGUID, server->client_guid, + SMB2_CLIENT_GUID_SIZE); iov[0].iov_base = (char *)req; /* 4 for rfc1002 length field */ |