[SCM] Samba Shared Repository - branch master updated

Jeremy Allison jra at samba.org
Sun Nov 22 01:23:03 UTC 2020


The branch, master has been updated
       via  53c39a26197 s3: smbd: Fix misleading comment I added for commit 382a5c4e7ec08ec9291453ffad9541ab36aca274
      from  39536286d45 testprogs: Fix MIT KRB5 export keytab with > 1.18

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 53c39a261973f5e0ea1944c82ec14812187ed03f
Author: Jeremy Allison <jra at samba.org>
Date:   Sat Nov 21 15:55:08 2020 -0800

    s3: smbd: Fix misleading comment I added for commit 382a5c4e7ec08ec9291453ffad9541ab36aca274
    
    smbd: Fix failure to check dstdir for delete on close
    
    We're preventing ourselves from holding two locks here,
    not protecting from waiting for a lock someone else
    holds.
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Volker Lendecke <Volker.Lendecke at SerNet.DE>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Sun Nov 22 01:22:36 UTC 2020 on sn-devel-184

-----------------------------------------------------------------------

Summary of changes:
 source3/smbd/open.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 11ddfc6eb09..3f5bc89cefe 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -375,8 +375,10 @@ NTSTATUS check_parent_access(struct connection_struct *conn,
 
 	/*
 	 * Don't take a lock here. We just need a snapshot
-	 * of the current state of delete on close and someone
-	 * else may already have a lock on this id.
+	 * of the current state of delete on close and this is
+	 * called in a codepath where we may already have a lock
+	 * (and we explicitly can't hold 2 locks at the same time
+	 * as that may deadlock).
 	 */
 	lck = fetch_share_mode_unlocked(frame, id);
 	if (lck == NULL) {


-- 
Samba Shared Repository



More information about the samba-cvs mailing list