Attachment 17780 Details for Bug 15314 – Raw tested patch for master.

[patch] Raw tested patch for master.

look (text/plain), 1.07 KB, created by Jeremy Allison on 2023-02-28 01:11:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2023-02-28 01:11:09 UTC

Size: 1.07 KB

patch

obsolete

>diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
>index e9775387d11..d6fd51dee9e 100644
>--- a/source3/smbd/filename.c
>+++ b/source3/smbd/filename.c
>@@ -1386,6 +1386,16 @@ static NTSTATUS filename_convert_dirfsp_nosymlink(
> 			status = NT_STATUS_NO_MEMORY;
> 			goto fail;
> 		}
>+		/*
>+		 * When open_stream_pathref_fsp() returns
>+		 * NT_STATUS_OBJECT_NAME_NOT_FOUND, smb_fname_rel->fsp
>+		 * has been set to zero, so we must free base_fsp separately
>+		 * to prevent fd-leaks when opening a stream that doesn't
>+		 * exist.
>+		 */
>+		fd_close(base_fsp);
>+		file_free(NULL, base_fsp);
>+		base_fsp = NULL;
> 		goto done;
> 	}
> 
>@@ -1402,6 +1412,17 @@ done:
> 	return NT_STATUS_OK;
> 
> fail:
>+	/*
>+	 * If open_stream_pathref_fsp() returns an error, smb_fname_rel->fsp
>+	 * has been set to zero, so we must free base_fsp separately
>+	 * to prevent fd-leaks when opening a stream that doesn't
>+	 * exist.
>+	 */
>+	if (base_fsp != NULL) {
>+		fd_close(base_fsp);
>+		file_free(NULL, base_fsp);
>+		base_fsp = NULL;
>+	}
> 	TALLOC_FREE(dirname);
> 	TALLOC_FREE(smb_dirname);
> 	TALLOC_FREE(smb_fname_rel);

Actions: View

Attachments on bug 15314: 17763 | 17780 | 17784 | 17790