From 1f49241782c419c15b4430b026eca7306c06940f Mon Sep 17 00:00:00 2001 From: Ralph Boehme 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 Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison 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