Attachment 16576 Details for Bug 14679 – git-am fix for 4.14.next, 4.13.next, 4.12.next.

[patch] git-am fix for 4.14.next, 4.13.next, 4.12.next.

bug-14679-4.14 (text/plain), 7.47 KB, created by Jeremy Allison on 2021-03-31 16:38:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2021-03-31 16:38:01 UTC

Size: 7.47 KB

patch

obsolete

>From aa065342d2795526de1bd7893ca9b80790176457 Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Tue, 30 Mar 2021 15:05:47 -0700
>Subject: [PATCH 1/2] s4: torture. Add smb2.lease.rename_wait test to reproduce
> regression in delay rename for lease break code.
>
>Passes against Windows 10. Add to knownfail, the
>next commit will fix this.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14679
>CI: https://gitlab.com/samba-team/samba/-/merge_requests/1875
>
>Back-ported from 8d9a0b8d57713781c72440c7e91746b5d89e6f6a.
>
>Signed-off-by: Jeremy Allison <jra@samba.org>
>Reviewed-by: Ralph Boehme <slow@samba.org>
>---
> selftest/knownfail.d/samba3.smb2.lease |   1 +
> source4/torture/smb2/lease.c           | 145 +++++++++++++++++++++++++
> 2 files changed, 146 insertions(+)
> create mode 100644 selftest/knownfail.d/samba3.smb2.lease
>
>diff --git a/selftest/knownfail.d/samba3.smb2.lease b/selftest/knownfail.d/samba3.smb2.lease
>new file mode 100644
>index 00000000000..4e66e2f6539
>--- /dev/null
>+++ b/selftest/knownfail.d/samba3.smb2.lease
>@@ -0,0 +1 @@
>+^samba3.smb2.lease.rename_wait\(nt4_dc\)
>diff --git a/source4/torture/smb2/lease.c b/source4/torture/smb2/lease.c
>index d3b8daea310..824db95a4b5 100644
>--- a/source4/torture/smb2/lease.c
>+++ b/source4/torture/smb2/lease.c
>@@ -3722,6 +3722,148 @@ static bool test_lease_timeout(struct torture_context *tctx,
> 	return ret;
> }
> 
>+static bool test_lease_rename_wait(struct torture_context *tctx,
>+                               struct smb2_tree *tree)
>+{
>+	TALLOC_CTX *mem_ctx = talloc_new(tctx);
>+	struct smb2_create io;
>+	struct smb2_lease ls1;
>+	struct smb2_lease ls2;
>+	struct smb2_lease ls3;
>+	struct smb2_handle h1 = {{0}};
>+	struct smb2_handle h2 = {{0}};
>+	struct smb2_handle h3 = {{0}};
>+	union smb_setfileinfo sinfo;
>+	NTSTATUS status;
>+	const char *fname_src = "lease_rename_src.dat";
>+	const char *fname_dst = "lease_rename_dst.dat";
>+	bool ret = true;
>+	struct smb2_lease_break_ack ack = {};
>+	struct smb2_request *rename_req = NULL;
>+	uint32_t caps;
>+	unsigned int i;
>+
>+	caps = smb2cli_conn_server_capabilities(tree->session->transport->conn);
>+	if (!(caps & SMB2_CAP_LEASING)) {
>+		torture_skip(tctx, "leases are not supported");
>+	}
>+
>+	smb2_util_unlink(tree, fname_src);
>+	smb2_util_unlink(tree, fname_dst);
>+
>+	/* Short timeout for fails. */
>+	tree->session->transport->options.request_timeout = 15;
>+
>+	/* Grab a RH lease. */
>+	smb2_lease_create(&io,
>+			&ls1,
>+			false,
>+			fname_src,
>+			LEASE1,
>+			smb2_util_lease_state("RH"));
>+	status = smb2_create(tree, mem_ctx, &io);
>+	CHECK_STATUS(status, NT_STATUS_OK);
>+	CHECK_CREATED(&io, CREATED, FILE_ATTRIBUTE_ARCHIVE);
>+	CHECK_LEASE(&io, "RH", true, LEASE1, 0);
>+	h1 = io.out.file.handle;
>+
>+	/* Second open with a RH lease. */
>+	smb2_lease_create(&io,
>+			&ls2,
>+			false,
>+			fname_src,
>+			LEASE2,
>+			smb2_util_lease_state("RH"));
>+	io.in.create_disposition = NTCREATEX_DISP_OPEN;
>+	io.in.desired_access = GENERIC_READ_ACCESS;
>+	status = smb2_create(tree, mem_ctx, &io);
>+	CHECK_STATUS(status, NT_STATUS_OK);
>+	CHECK_CREATED(&io, EXISTED, FILE_ATTRIBUTE_ARCHIVE);
>+	CHECK_LEASE(&io, "RH", true, LEASE2, 0);
>+	h2 = io.out.file.handle;
>+
>+	/*
>+	 * Don't ack a lease break.
>+	 */
>+	tree->session->transport->lease.handler	= torture_lease_handler;
>+	tree->session->transport->lease.private_data = tree;
>+	torture_reset_lease_break_info(tctx, &lease_break_info);
>+	lease_break_info.lease_skip_ack = true;
>+
>+	/* Break with a rename. */
>+	ZERO_STRUCT(sinfo);
>+	sinfo.rename_information.level = RAW_SFILEINFO_RENAME_INFORMATION;
>+	sinfo.rename_information.in.file.handle = h1;
>+	sinfo.rename_information.in.overwrite = true;
>+	sinfo.rename_information.in.new_name = fname_dst;
>+	rename_req = smb2_setinfo_file_send(tree, &sinfo);
>+
>+	torture_assert(tctx,
>+			rename_req != NULL,
>+			"smb2_setinfo_file_send");
>+	torture_assert(tctx,
>+			rename_req->state == SMB2_REQUEST_RECV,
>+			"rename pending");
>+
>+	/* Try and open the destination with a RH lease. */
>+	smb2_lease_create(&io,
>+			&ls3,
>+			false,
>+			fname_dst,
>+			LEASE3,
>+			smb2_util_lease_state("RH"));
>+	/* We want to open, not create. */
>+	io.in.create_disposition = NTCREATEX_DISP_OPEN;
>+	io.in.desired_access = GENERIC_READ_ACCESS;
>+	status = smb2_create(tree, mem_ctx, &io);
>+	CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_NOT_FOUND);
>+
>+	/*
>+	 * The smb2_create() I/O should have picked up the break request
>+	 * caused by the pending rename.
>+	 */
>+
>+	/* Copy the break request. */
>+	ack.in.lease.lease_key =
>+		lease_break_info.lease_break.current_lease.lease_key;
>+	ack.in.lease.lease_state =
>+		lease_break_info.lease_break.new_lease_state;
>+
>+	/*
>+	 * Give the server 3 more chances to have renamed
>+	 * the file. Better than doing a sleep.
>+	 */
>+	for (i = 0; i < 3; i++) {
>+		status = smb2_create(tree, mem_ctx, &io);
>+		CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_NOT_FOUND);
>+	}
>+
>+	/* Ack the break. The server is now free to rename. */
>+	status = smb2_lease_break_ack(tree, &ack);
>+	CHECK_STATUS(status, NT_STATUS_OK);
>+
>+	/* Get the rename reply. */
>+	status = smb2_setinfo_recv(rename_req);
>+	CHECK_STATUS(status, NT_STATUS_OK);
>+
>+	/* The target should now exist. */
>+	status = smb2_create(tree, mem_ctx, &io);
>+	CHECK_STATUS(status, NT_STATUS_OK);
>+	h3 = io.out.file.handle;
>+
>+ done:
>+	smb2_util_close(tree, h1);
>+	smb2_util_close(tree, h2);
>+	smb2_util_close(tree, h3);
>+
>+	smb2_util_unlink(tree, fname_src);
>+	smb2_util_unlink(tree, fname_dst);
>+
>+	talloc_free(mem_ctx);
>+
>+	return ret;
>+}
>+
> static bool test_lease_v2_rename(struct torture_context *tctx,
> 				 struct smb2_tree *tree)
> {
>@@ -4192,6 +4334,9 @@ struct torture_suite *torture_smb2_lease_init(TALLOC_CTX *ctx)
> 	torture_suite_add_1smb2_test(suite, "dynamic_share", test_lease_dynamic_share);
> 	torture_suite_add_1smb2_test(suite, "timeout", test_lease_timeout);
> 	torture_suite_add_1smb2_test(suite, "unlink", test_lease_unlink);
>+	torture_suite_add_1smb2_test(suite, "rename_wait",
>+				test_lease_rename_wait);
>+
> 
> 	suite->description = talloc_strdup(suite, "SMB2-LEASE tests");
> 
>-- 
>2.27.0
>
>
>From 2f335503bbb1070713987ce90cbfccc8ef1e5150 Mon Sep 17 00:00:00 2001
>From: Ralph Boehme <slow@samba.org>
>Date: Mon, 29 Mar 2021 12:24:39 +0200
>Subject: [PATCH 2/2] s3: smbd: fix deferred renames
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>This was broken by c7a9e0e4cdfb22e66533b5c8e20af3cfdb8ae78c.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14679
>CI: https://gitlab.com/samba-team/samba/-/merge_requests/1875
>
>Signed-off-by: Ralph Boehme <slow@samba.org>
>Reviewed-by: Jeremy Allison <jra@amba.org>
>
>Autobuild-User(master): Ralph BÃ¶hme <slow@samba.org>
>Autobuild-Date(master): Wed Mar 31 06:13:39 UTC 2021 on sn-devel-184
>
>(cherry picked from commit 10d753868e810604d8f60673bbd48f55aaff0797)
>---
> selftest/knownfail.d/samba3.smb2.lease | 1 -
> source3/smbd/smb2_setinfo.c            | 1 +
> 2 files changed, 1 insertion(+), 1 deletion(-)
> delete mode 100644 selftest/knownfail.d/samba3.smb2.lease
>
>diff --git a/selftest/knownfail.d/samba3.smb2.lease b/selftest/knownfail.d/samba3.smb2.lease
>deleted file mode 100644
>index 4e66e2f6539..00000000000
>--- a/selftest/knownfail.d/samba3.smb2.lease
>+++ /dev/null
>@@ -1 +0,0 @@
>-^samba3.smb2.lease.rename_wait\(nt4_dc\)
>diff --git a/source3/smbd/smb2_setinfo.c b/source3/smbd/smb2_setinfo.c
>index 646e009a746..e490596a2e0 100644
>--- a/source3/smbd/smb2_setinfo.c
>+++ b/source3/smbd/smb2_setinfo.c
>@@ -214,6 +214,7 @@ static bool delay_rename_lease_break_fn(
> 		return false;
> 	}
> 
>+	state->delay = true;
> 	break_to = (e_lease_type & ~SMB2_LEASE_HANDLE);
> 
> 	send_break_message(
>-- 
>2.27.0
>

Flags:

slow: review+

Actions: View

Attachments on bug 14679: 16574 | 16576