Attachment 16749 Details for Bug 14809 – git-am fix for master.

[patch] git-am fix for master.

bug-14809-master (text/plain), 1.90 KB, created by Jeremy Allison on 2021-08-24 00:47:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2021-08-24 00:47:30 UTC

Size: 1.90 KB

patch

obsolete

>From 79b3db5458f1c91b10192eac4529b074840f836c Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Mon, 23 Aug 2021 17:40:42 -0700
>Subject: [PATCH 1/2] s3: mdssvc: Correctly disconnect the VFS connection
> inside the mds_ctx destructor.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14809
>
>Signed-off-by: Jeremy Allison <jra@samba.org>
>---
> source3/rpc_server/mdssvc/mdssvc.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
>diff --git a/source3/rpc_server/mdssvc/mdssvc.c b/source3/rpc_server/mdssvc/mdssvc.c
>index d0e87dcf646..fa31b55a183 100644
>--- a/source3/rpc_server/mdssvc/mdssvc.c
>+++ b/source3/rpc_server/mdssvc/mdssvc.c
>@@ -1569,6 +1569,11 @@ static int mds_ctx_destructor_cb(struct mds_ctx *mds_ctx)
> 	}
> 	TALLOC_FREE(mds_ctx->ino_path_map);
> 
>+	if (mds_ctx->conn != NULL) {
>+		SMB_VFS_DISCONNECT(mds_ctx->conn);
>+		conn_free(mds_ctx->conn);
>+	}
>+
> 	ZERO_STRUCTP(mds_ctx);
> 
> 	return 0;
>-- 
>2.30.2
>
>
>From 0ecd885086bb570157b3d0b23b49104e30ff342a Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Mon, 23 Aug 2021 17:42:40 -0700
>Subject: [PATCH 2/2] s3: smbd: In create_conn_struct_cwd(), don't
> TALLOC_FREE() an unallocated pointer on error.
>
>Just return the status - if create_conn_struct_as_root() fails
>the connection struct never gets returned.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14809
>
>Signed-off-by: Jeremy Allison <jra@samba.org>
>---
> source3/smbd/msdfs.c | 7 +------
> 1 file changed, 1 insertion(+), 6 deletions(-)
>
>diff --git a/source3/smbd/msdfs.c b/source3/smbd/msdfs.c
>index 45b6478985d..995ed815d90 100644
>--- a/source3/smbd/msdfs.c
>+++ b/source3/smbd/msdfs.c
>@@ -525,12 +525,7 @@ NTSTATUS create_conn_struct_cwd(TALLOC_CTX *mem_ctx,
> 					    path,
> 					    session_info);
> 	unbecome_root();
>-	if (!NT_STATUS_IS_OK(status)) {
>-		TALLOC_FREE(c);
>-		return status;
>-	}
>-
>-	return NT_STATUS_OK;
>+	return status;
> }
> 
> static void shuffle_strlist(char **list, int count)
>-- 
>2.30.2
>

Actions: View

Attachments on bug 14809: 16748 | 16749 | 16753