[SCM] Samba Shared Repository - branch master updated

Günther Deschner gd at samba.org
Mon Oct 16 17:57:02 UTC 2017


The branch, master has been updated
       via  7917f97 vfs_fruit: Replace closedir() by SMB_VFS_CLOSEDIR
      from  2abc127 docs-xml: Fix a typo in manpage for vfs_fruit

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


- Log -----------------------------------------------------------------
commit 7917f9721c9f8efdf9e7b7c50a9e5147250e36fe
Author: Anoop C S <anoopcs at redhat.com>
Date:   Fri Oct 13 20:38:31 2017 +0530

    vfs_fruit: Replace closedir() by SMB_VFS_CLOSEDIR
    
    Pointer to directory 'dh' inside fruit_rmdir() is obtained using
    SMB_VFS_OPENDIR. But this handle is closed directly by invoking
    closedir() rather than SMB_VFS_CLOSEDIR. This will result in a
    smbd crash if this handle was not obtained from local file system.
    Therefore use SMB_VFS_CLOSEDIR corresponding to SMB_VFS_OPENDIR
    to correctly close the directory handle.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=13086
    
    Signed-off-by: Anoop C S <anoopcs at redhat.com>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Guenther Deschner <gd at samba.org>
    
    Autobuild-User(master): Günther Deschner <gd at samba.org>
    Autobuild-Date(master): Mon Oct 16 19:56:55 CEST 2017 on sn-devel-144

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

Summary of changes:
 source3/modules/vfs_fruit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
index 2771980..b0dd0f0 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -3785,7 +3785,7 @@ static int fruit_rmdir(struct vfs_handle_struct *handle,
 
 exit_rmdir:
 	if (dh) {
-		closedir(dh);
+		SMB_VFS_CLOSEDIR(handle->conn, dh);
 	}
 	return SMB_VFS_NEXT_RMDIR(handle, smb_fname);
 }


-- 
Samba Shared Repository



More information about the samba-cvs mailing list