sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

s3: Fix fsctl_validate_neg_info to pass MS compliance suite.

Browse Source 
It turns out that all the client and server need to agree on is what
protocol should have been negotiated.  If they disagree, they should
disconnect.  The contents of the list of protocols used during
negotiate and during FSCTL_VALIDATE_NEGOTIATE_INFO do not need to match.

Signed-off-by: Ira Cooper <ira@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Mon Jun 23 14:28:25 CEST 2014 on sn-devel-104
This commit is contained in:
Ira Cooper 2014-06-20 21:41:19 -07:00 committed by Stefan Metzmacher
parent 6221937aca
commit 439de096ae
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
source3/smbd/smb2_ioctl_network_fs.c
View File

@ -355,9 +355,10 @@ static NTSTATUS fsctl_validate_neg_info(TALLOC_CTX *mem_ctx,
struct GUID in_guid;
uint16_t in_security_mode;
uint16_t in_num_dialects;
uint16_t i;
uint16_t dialect;
DATA_BLOB out_guid_blob;
NTSTATUS status;
enum protocol_types protocol = PROTOCOL_NONE;
if (in_input->length < 0x18) {
return NT_STATUS_INVALID_PARAMETER;
@ -381,20 +382,25 @@ static NTSTATUS fsctl_validate_neg_info(TALLOC_CTX *mem_ctx,
return status;
}
if (in_num_dialects != conn->smb2.client.num_dialects) {
/*
* From: [MS-SMB2]
* 3.3.5.15.12 Handling a Validate Negotiate Info Request
*
* The server MUST determine the greatest common dialect
* between the dialects it implements and the Dialects array
* of the VALIDATE_NEGOTIATE_INFO request. If no dialect is
* matched, or if the value is not equal to Connection.Dialect,
* the server MUST terminate the transport connection
* and free the Connection object.
*/
protocol = smbd_smb2_protocol_dialect_match(in_input->data + 0x18,
in_num_dialects,
&dialect);
if (conn->protocol != protocol) {
*disconnect = true;
return NT_STATUS_ACCESS_DENIED;
}
for (i=0; i < in_num_dialects; i++) {
uint16_t v = SVAL(in_input->data, 0x18 + i*2);
if (conn->smb2.client.dialects[i] != v) {
*disconnect = true;
return NT_STATUS_ACCESS_DENIED;
}
}
if (!GUID_equal(&in_guid, &conn->smb2.client.guid)) {
*disconnect = true;
return NT_STATUS_ACCESS_DENIED;