Attachment 17977 Details for Bug 15417 – Patch for Samba 4.17 and 4.18, cherry-picked from master

[patch] Patch for Samba 4.17 and 4.18, cherry-picked from master

0001-smbd-don-t-leak-the-fsp-if-close_file_smb-fails.patch (text/plain), 1.23 KB, created by Björn Baumbach on 2023-07-11 14:13:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Björn Baumbach

Created: 2023-07-11 14:13:52 UTC

Size: 1.23 KB

patch

obsolete

>From 1f49241782c419c15b4430b026eca7306c06940f Mon Sep 17 00:00:00 2001
>From: Ralph Boehme <slow@samba.org>
>Date: Mon, 10 Jul 2023 16:34:23 +0200
>Subject: [PATCH] smbd: don't leak the fsp if close_file_smb() fails
>
>This can happen if DELETE-ON-CLOSE is set, but the deletion fails for some
>reason.
>
>The bug was introduced by 1808e5c133474eabc9d3cf91c2a92ec4d92d9fdd.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=15417
>
>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): Mon Jul 10 21:32:32 UTC 2023 on atb-devel-224
>
>(cherry picked from commit 4da50463e1b75c06d5f8c066e8b4eff48186afb0)
>---
> source3/smbd/smb2_close.c | 2 ++
> 1 file changed, 2 insertions(+)
>
>diff --git a/source3/smbd/smb2_close.c b/source3/smbd/smb2_close.c
>index ed2b21dc5bc..7812c32afa4 100644
>--- a/source3/smbd/smb2_close.c
>+++ b/source3/smbd/smb2_close.c
>@@ -225,6 +225,8 @@ static NTSTATUS smbd_smb2_close(struct smbd_smb2_request *req,
> 	if (!NT_STATUS_IS_OK(status)) {
> 		DEBUG(5,("smbd_smb2_close: close_file[%s]: %s\n",
> 			 smb_fname_str_dbg(smb_fname), nt_errstr(status)));
>+		file_free(smbreq, fsp);
>+		*_fsp = fsp = NULL;
> 		return status;
> 	}
> 
>-- 
>2.34.1
>

Flags:

bbaumbach: review? (jra)
slow: review+

Actions: View

Attachments on bug 15417: 17977 | 17978