Attachment 18189 Details for Bug 15521 – Patch for 4.18 and 4.19 cherry-picked from master

[patch] Patch for 4.18 and 4.19 cherry-picked from master

bug15521-v418,v419.patch (text/plain), 2.34 KB, created by Ralph Böhme on 2023-11-20 08:32:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralph Böhme

Created: 2023-11-20 08:32:39 UTC

Size: 2.34 KB

patch

obsolete

>From e1f5e9382c6e149a72074f1a9bcad1f11bf9e9ca Mon Sep 17 00:00:00 2001
>From: Ralph Boehme <slow@samba.org>
>Date: Thu, 16 Nov 2023 10:50:32 +0100
>Subject: [PATCH] smbd: fix close order of base_fsp and stream_fsp in
> smb_fname_fsp_destructor()
>
>VFS modules like streams_xattr use the function fsp_is_alternate_stream() on the
>fsp to determine in an fsp is a stream, eg in streams_xattr_close(). If
>fspo->base_fsp is arlready set to NULL, this won't work anymore.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=15521
>
>Signed-off-by: Ralph Boehme <slow@samba.org>
>Reviewed-by: Jeremy Allison <jra@samba.org>
>
>Autobuild-User(master): Jeremy Allison <jra@samba.org>
>Autobuild-Date(master): Thu Nov 16 18:31:17 UTC 2023 on atb-devel-224
>
>(cherry picked from commit 4481a67c1b20549a71d6c5132b637798a09f966d)
>---
> source3/smbd/files.c | 24 +++++++++++++-----------
> 1 file changed, 13 insertions(+), 11 deletions(-)
>
>diff --git a/source3/smbd/files.c b/source3/smbd/files.c
>index 46f988d8d8ce..9dcab463d3b1 100644
>--- a/source3/smbd/files.c
>+++ b/source3/smbd/files.c
>@@ -407,6 +407,7 @@ static void destroy_fsp_smb_fname_link(struct fsp_smb_fname_link **_link)
> static int smb_fname_fsp_destructor(struct smb_filename *smb_fname)
> {
> 	struct files_struct *fsp = smb_fname->fsp;
>+	struct files_struct *base_fsp = NULL;
> 	NTSTATUS status;
> 	int saved_errno = errno;
> 
>@@ -418,17 +419,7 @@ static int smb_fname_fsp_destructor(struct smb_filename *smb_fname)
> 	}
> 
> 	if (fsp_is_alternate_stream(fsp)) {
>-		struct files_struct *tmp_base_fsp = fsp->base_fsp;
>-
>-		fsp_set_base_fsp(fsp, NULL);
>-
>-		status = fd_close(tmp_base_fsp);
>-		if (!NT_STATUS_IS_OK(status)) {
>-			DBG_ERR("Closing fd for fsp [%s] failed: %s. "
>-				"Please check your filesystem!!!\n",
>-				fsp_str_dbg(fsp), nt_errstr(status));
>-		}
>-		file_free(NULL, tmp_base_fsp);
>+		base_fsp = fsp->base_fsp;
> 	}
> 
> 	status = fd_close(fsp);
>@@ -440,6 +431,17 @@ static int smb_fname_fsp_destructor(struct smb_filename *smb_fname)
> 	file_free(NULL, fsp);
> 	smb_fname->fsp = NULL;
> 
>+	if (base_fsp != NULL) {
>+		base_fsp->stream_fsp = NULL;
>+		status = fd_close(base_fsp);
>+		if (!NT_STATUS_IS_OK(status)) {
>+			DBG_ERR("Closing fd for base_fsp [%s] failed: %s. "
>+				"Please check your filesystem!!!\n",
>+				fsp_str_dbg(base_fsp), nt_errstr(status));
>+		}
>+		file_free(NULL, base_fsp);
>+	}
>+
> 	errno = saved_errno;
> 	return 0;
> }
>-- 
>2.41.0
>

Flags:

jra: review+

Actions: View

Attachments on bug 15521: 18189