Attachment 13200 Details for Bug 12772 – Possible patch for master (needs regression tests)

[patch] Possible patch for master (needs regression tests)

tmp.diff.txt (text/plain), 2.06 KB, created by Stefan Metzmacher on 2017-05-08 09:29:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Metzmacher

Created: 2017-05-08 09:29:58 UTC

Size: 2.06 KB

patch

obsolete

>From 0b05d3fbde0bc0c3ed630ca9ae288ae815efb9ff Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Fri, 5 May 2017 18:49:37 +0200
>Subject: [PATCH] s3:smbd: unimplement FSCTL_VALIDATE_NEGOTIATE_INFO with
> "server max protocol = SMB2_02"
>
>A client that supports SMB3 will do a signed FSCTL_VALIDATE_NEGOTIATE_INFO
>after a tree connect. This FSCTL_VALIDATE_NEGOTIATE_INFO call contains
>the client capabilities, client guid, security mode and the array of supported
>dialects. But if SMB 2.02 is negotiated the doesn't send these values to the
>server in the first connection attempt (when the client starts with a SMB1 Negotiate).
>
>Windows servers that only support SMB2 just return NT_STATUS_FILE_CLOSED
>as answer to FSCTL_VALIDATE_NEGOTIATE_INFO.
>
>We should do the same if we just pretend to support SMB 2.02,
>as SMB 2.10 always include an SMB2 Negotiate request we can leave it as is.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=12772
>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>---
> source3/smbd/smb2_ioctl_network_fs.c | 17 +++++++++++++++++
> 1 file changed, 17 insertions(+)
>
>diff --git a/source3/smbd/smb2_ioctl_network_fs.c b/source3/smbd/smb2_ioctl_network_fs.c
>index 5b869ec..8be2f6a 100644
>--- a/source3/smbd/smb2_ioctl_network_fs.c
>+++ b/source3/smbd/smb2_ioctl_network_fs.c
>@@ -578,6 +578,23 @@ static NTSTATUS fsctl_validate_neg_info(TALLOC_CTX *mem_ctx,
> 	NTSTATUS status;
> 	enum protocol_types protocol = PROTOCOL_NONE;
> 
>+	if (lp_server_max_protocol() <= PROTOCOL_SMB2_02) {
>+		/*
>+		 * With SMB 2.02 we didn't get the
>+		 * capabitities, client guid, security mode
>+		 * and dialects the client would have offered.
>+		 *
>+		 * So we behave compatible with a true
>+		 * SMB 2.02 server and return NT_STATUS_FILE_CLOSED.
>+		 *
>+		 * As SMB >= 2.10 offers the two phase SMB2 Negotiate
>+		 * we keep supporting FSCTL_VALIDATE_NEGOTIATE_INFO
>+		 * starting with SMB 2.10, while Windows only supports
>+		 * it starting with SMB > 2.10.
>+		 */
>+		return NT_STATUS_FILE_CLOSED;
>+	}
>+
> 	if (in_input->length < 0x18) {
> 		return NT_STATUS_INVALID_PARAMETER;
> 	}
>-- 
>1.9.1
>

Actions: View

Attachments on bug 12772: 13200 | 13327 | 13328