Attachment 13749 Details for Bug 13047 – Updated fix for 4.6.next.

[patch] Updated fix for 4.6.next.

4-6-fix (text/plain), 9.09 KB, created by Jeremy Allison on 2017-11-01 17:40:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2017-11-01 17:40:32 UTC

Size: 9.09 KB

patch

obsolete

>From 0fb6a5061d0f6caed2defe37433bccbb82a6855e Mon Sep 17 00:00:00 2001
>From: Christof Schmitt <cs@samba.org>
>Date: Thu, 21 Sep 2017 17:41:25 -0700
>Subject: [PATCH 1/4] smbd: Move check for SMB2 compound request to new
> function
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=13047
>
>Signed-off-by: Christof Schmitt <cs@samba.org>
>Reviewed-by: Jeremy Allison <jra@samba.org>
>(cherry picked from commit cfa2c3083080016a1288474b8879039db4dbf6b1)
>---
> source3/smbd/globals.h     | 1 +
> source3/smbd/smb2_read.c   | 2 +-
> source3/smbd/smb2_server.c | 5 +++++
> 3 files changed, 7 insertions(+), 1 deletion(-)
>
>diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
>index 67d3a892d58..d3b9800f590 100644
>--- a/source3/smbd/globals.h
>+++ b/source3/smbd/globals.h
>@@ -224,6 +224,7 @@ void smbd_server_connection_terminate_ex(struct smbXsrv_connection *xconn,
> 
> const char *smb2_opcode_name(uint16_t opcode);
> bool smbd_is_smb2_header(const uint8_t *inbuf, size_t size);
>+bool smbd_smb2_is_compound(const struct smbd_smb2_request *req);
> 
> NTSTATUS smbd_add_connection(struct smbXsrv_client *client, int sock_fd,
> 			     struct smbXsrv_connection **_xconn);
>diff --git a/source3/smbd/smb2_read.c b/source3/smbd/smb2_read.c
>index 89527f38748..c28aaae4ecf 100644
>--- a/source3/smbd/smb2_read.c
>+++ b/source3/smbd/smb2_read.c
>@@ -345,7 +345,7 @@ static NTSTATUS schedule_smb2_sendfile_read(struct smbd_smb2_request *smb2req,
> 	if (!lp__use_sendfile(SNUM(fsp->conn)) ||
> 	    smb2req->do_signing ||
> 	    smb2req->do_encryption ||
>-	    smb2req->in.vector_count >= (2*SMBD_SMB2_NUM_IOV_PER_REQ) ||
>+	    smbd_smb2_is_compound(smb2req) ||
> 	    (fsp->base_fsp != NULL) ||
> 	    (fsp->wcp != NULL) ||
> 	    (!S_ISREG(fsp->fsp_name->st.st_ex_mode)) ||
>diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
>index acaa0126dd8..e6bc7536938 100644
>--- a/source3/smbd/smb2_server.c
>+++ b/source3/smbd/smb2_server.c
>@@ -204,6 +204,11 @@ bool smbd_is_smb2_header(const uint8_t *inbuf, size_t size)
> 	return true;
> }
> 
>+bool smbd_smb2_is_compound(const struct smbd_smb2_request *req)
>+{
>+	return req->in.vector_count >= (2*SMBD_SMB2_NUM_IOV_PER_REQ);
>+}
>+
> static NTSTATUS smbd_initialize_smb2(struct smbXsrv_connection *xconn,
> 				     uint64_t expected_seq_low)
> {
>-- 
>2.15.0.403.gc27cc4dac6-goog
>
>
>From 065dff610bb9ce96f5b51f8d64c6ec10b0511bed Mon Sep 17 00:00:00 2001
>From: Christof Schmitt <cs@samba.org>
>Date: Thu, 21 Sep 2017 12:08:01 -0700
>Subject: [PATCH 2/4] smbd/aio: Do not go async for SMB2 compound requests
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=13047
>
>Signed-off-by: Christof Schmitt <cs@samba.org>
>Reviewed-by: Jeremy Allison <jra@samba.org>
>(cherry picked from commit a2b081e159403e10295a1bc089b48e816ce698b9)
>---
> source3/smbd/aio.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
>diff --git a/source3/smbd/aio.c b/source3/smbd/aio.c
>index ff1be138246..37b0f8fb9b0 100644
>--- a/source3/smbd/aio.c
>+++ b/source3/smbd/aio.c
>@@ -707,6 +707,10 @@ NTSTATUS schedule_smb2_aio_read(connection_struct *conn,
> 		return NT_STATUS_RETRY;
> 	}
> 
>+	if (smbd_smb2_is_compound(smbreq->smb2req)) {
>+		return NT_STATUS_RETRY;
>+	}
>+
> 	/* Create the out buffer. */
> 	*preadbuf = data_blob_talloc(ctx, NULL, smb_maxcnt);
> 	if (preadbuf->data == NULL) {
>@@ -856,6 +860,10 @@ NTSTATUS schedule_aio_smb2_write(connection_struct *conn,
> 		return NT_STATUS_RETRY;
> 	}
> 
>+	if (smbd_smb2_is_compound(smbreq->smb2req)) {
>+		return NT_STATUS_RETRY;
>+	}
>+
> 	if (smbreq->unread_bytes) {
> 		/* Can't do async with recvfile. */
> 		return NT_STATUS_RETRY;
>-- 
>2.15.0.403.gc27cc4dac6-goog
>
>
>From 8e76826b31edcada5d8e7d98281cd4b23b791e3e Mon Sep 17 00:00:00 2001
>From: Christof Schmitt <cs@samba.org>
>Date: Wed, 20 Sep 2017 16:07:50 -0700
>Subject: [PATCH 3/4] torture: Add testcase for compound CREATE-WRITE-CLOSE
> request
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=13047
>
>Signed-off-by: Christof Schmitt <cs@samba.org>
>Reviewed-by: Jeremy Allison <jra@samba.org>
>(cherry picked from commit 508aebf40abe83b6319700260c405ada0566a46b)
>---
> source4/torture/smb2/compound.c | 73 +++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 73 insertions(+)
>
>diff --git a/source4/torture/smb2/compound.c b/source4/torture/smb2/compound.c
>index a502103be68..18560546a2b 100644
>--- a/source4/torture/smb2/compound.c
>+++ b/source4/torture/smb2/compound.c
>@@ -671,6 +671,77 @@ done:
> 	return ret;
> }
> 
>+static bool test_compound_create_write_close(struct torture_context *tctx,
>+					     struct smb2_tree *tree)
>+{
>+	struct smb2_handle handle = { .data = { UINT64_MAX, UINT64_MAX } };
>+	struct smb2_create create;
>+	struct smb2_write write;
>+	struct smb2_close close;
>+	const char *fname = "compound_create_write_close.dat";
>+	struct smb2_request *req[3];
>+	NTSTATUS status;
>+	bool ret = false;
>+
>+	smb2_util_unlink(tree, fname);
>+
>+	ZERO_STRUCT(create);
>+	create.in.security_flags = 0x00;
>+	create.in.oplock_level = 0;
>+	create.in.impersonation_level = NTCREATEX_IMPERSONATION_IMPERSONATION;
>+	create.in.create_flags = 0x00000000;
>+	create.in.reserved = 0x00000000;
>+	create.in.desired_access = SEC_RIGHTS_FILE_ALL;
>+	create.in.file_attributes = FILE_ATTRIBUTE_NORMAL;
>+	create.in.share_access = NTCREATEX_SHARE_ACCESS_READ |
>+		NTCREATEX_SHARE_ACCESS_WRITE |
>+		NTCREATEX_SHARE_ACCESS_DELETE;
>+	create.in.create_disposition = NTCREATEX_DISP_OPEN_IF;
>+	create.in.create_options = NTCREATEX_OPTIONS_SEQUENTIAL_ONLY |
>+		NTCREATEX_OPTIONS_ASYNC_ALERT |
>+		NTCREATEX_OPTIONS_NON_DIRECTORY_FILE |
>+		0x00200000;
>+	create.in.fname = fname;
>+
>+	smb2_transport_compound_start(tree->session->transport, 3);
>+
>+	req[0] = smb2_create_send(tree, &create);
>+
>+	smb2_transport_compound_set_related(tree->session->transport, true);
>+
>+	ZERO_STRUCT(write);
>+	write.in.file.handle = handle;
>+	write.in.offset = 0;
>+	write.in.data = data_blob_talloc(tctx, NULL, 1024);
>+
>+	req[1] = smb2_write_send(tree, &write);
>+
>+	ZERO_STRUCT(close);
>+	close.in.file.handle = handle;
>+
>+	req[2] = smb2_close_send(tree, &close);
>+
>+	status = smb2_create_recv(req[0], tree, &create);
>+	torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
>+					"CREATE failed.");
>+
>+	status = smb2_write_recv(req[1], &write);
>+	torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
>+					"WRITE failed.");
>+
>+	status = smb2_close_recv(req[2], &close);
>+	torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
>+					"CLOSE failed.");
>+
>+	status = smb2_util_unlink(tree, fname);
>+	torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
>+					"File deletion failed.");
>+
>+	ret = true;
>+done:
>+	return ret;
>+}
>+
> static bool test_compound_unrelated1(struct torture_context *tctx,
> 				     struct smb2_tree *tree)
> {
>@@ -1119,6 +1190,8 @@ struct torture_suite *torture_smb2_compound_init(void)
> 	torture_suite_add_1smb2_test(suite, "interim2",  test_compound_interim2);
> 	torture_suite_add_1smb2_test(suite, "compound-break", test_compound_break);
> 	torture_suite_add_1smb2_test(suite, "compound-padding", test_compound_padding);
>+	torture_suite_add_1smb2_test(suite, "create-write-close",
>+				     test_compound_create_write_close);
> 
> 	suite->description = talloc_strdup(suite, "SMB2-COMPOUND tests");
> 
>-- 
>2.15.0.403.gc27cc4dac6-goog
>
>
>From 269560afe6c89293025d52145e4191b2cbfc82e9 Mon Sep 17 00:00:00 2001
>From: Christof Schmitt <cs@samba.org>
>Date: Wed, 20 Sep 2017 16:13:38 -0700
>Subject: [PATCH 4/4] selftest: Also run smbtorture smb2.compound with aio
> enabled
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=13047
>
>Signed-off-by: Christof Schmitt <cs@samba.org>
>Reviewed-by: Jeremy Allison <jra@samba.org>
>
>Autobuild-User(master): Jeremy Allison <jra@samba.org>
>Autobuild-Date(master): Fri Sep 22 09:49:30 CEST 2017 on sn-devel-144
>
>(cherry picked from commit 3a360f552d6641952931d3aa8a9ce85a648de3e1)
>---
> selftest/knownfail        | 1 +
> source3/selftest/tests.py | 4 ++++
> 2 files changed, 5 insertions(+)
>
>diff --git a/selftest/knownfail b/selftest/knownfail
>index d16d7231711..713e39b8e27 100644
>--- a/selftest/knownfail
>+++ b/selftest/knownfail
>@@ -170,6 +170,7 @@
> ^samba3.smb2.setinfo.setinfo
> ^samba3.smb2.session.*reauth5 # some special anonymous checks?
> ^samba3.smb2.compound.interim2 # wrong return code (STATUS_CANCELLED)
>+^samba3.smb2.compound.aio.interim2 # wrong return code (STATUS_CANCELLED)
> ^samba3.smb2.replay.channel-sequence
> ^samba3.smb2.replay.replay3
> ^samba3.smb2.replay.replay4
>diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
>index b877d471957..2670ac410aa 100755
>--- a/source3/selftest/tests.py
>+++ b/source3/selftest/tests.py
>@@ -463,6 +463,10 @@ for t in tests:
>             plansmbtorture4testsuite(t, "fileserver", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
>     elif t == "vfs.acl_xattr":
>         plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
>+    elif t == "smb2.compound":
>+        plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
>+        plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/aio -U$USERNAME%$PASSWORD', '
>+        plansmbtorture4testsuite(t, "ad_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD')
>     else:
>         plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
>         plansmbtorture4testsuite(t, "ad_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD')
>-- 
>2.15.0.403.gc27cc4dac6-goog
>

Actions: View

Attachments on bug 13047: 13623 | 13624 | 13749 | 13774