The branch, master has been updated
via f86d1a35917 smbd: avoid a panic in close_directory()
from 6a74ec033e8 vfs: Remove files_struct->posix_flags
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit f86d1a35917cdcc07b2fa741c6a369aaad24abaf
Author: Ralph Boehme <[email protected]>
Date: Mon Nov 18 10:50:13 2024 +0100
smbd: avoid a panic in close_directory()
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15754
Signed-off-by: Ralph Boehme <[email protected]>
Reviewed-by: Volker Lendecke <[email protected]>
Autobuild-User(master): Ralph Böhme <[email protected]>
Autobuild-Date(master): Mon Nov 18 12:43:28 UTC 2024 on atb-devel-224
-----------------------------------------------------------------------
Summary of changes:
source3/smbd/close.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index 53e2aae1bf3..16356a07cc3 100644
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -1528,7 +1528,8 @@ static NTSTATUS close_directory(struct smb_request *req,
files_struct *fsp,
if (!NT_STATUS_IS_OK(status)) {
DBG_ERR("share_mode_entry_prepare_lock_del() failed for %s -
%s\n",
fsp_str_dbg(fsp), nt_errstr(status));
- return status;
+ log_stack_trace();
+ goto close_fd;
}
/* Remove the oplock before potentially deleting the file. */
@@ -1640,6 +1641,7 @@ done:
lease);
}
+close_fd:
status1 = fd_close(fsp);
if (!NT_STATUS_IS_OK(status1)) {
--
Samba Shared Repository