The branch, v4-21-test has been updated
       via  6afa2ce5dc2 smbd: avoid a panic in close_directory()
      from  0c3379c5bd8 examples:winexe: Initialize Trustee.ptstrName at the 
right time

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-21-test


- Log -----------------------------------------------------------------
commit 6afa2ce5dc2e8ec3650029f64b601a59d30f6e24
Author: Ralph Boehme <s...@samba.org>
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 <s...@samba.org>
    Reviewed-by: Volker Lendecke <v...@samba.org>
    
    Autobuild-User(master): Ralph Böhme <s...@samba.org>
    Autobuild-Date(master): Mon Nov 18 12:43:28 UTC 2024 on atb-devel-224
    
    (backported from commit f86d1a35917cdcc07b2fa741c6a369aaad24abaf)
    [s...@samba.org: context changes from Directory Leases]
    
    Autobuild-User(v4-21-test): Jule Anger <jan...@samba.org>
    Autobuild-Date(v4-21-test): Wed Nov 20 09:55:08 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 5cb2bb6f17c..1b027a319a4 100644
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -1495,7 +1495,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;
        }
 
        /*
@@ -1584,6 +1585,7 @@ done:
 
        remove_pending_change_notify_requests_by_fid(fsp, notify_status);
 
+close_fd:
        status1 = fd_close(fsp);
 
        if (!NT_STATUS_IS_OK(status1)) {


-- 
Samba Shared Repository

Reply via email to