[SCM] Samba Shared Repository - branch v4-6-test updated

Karolin Seeger kseeger at samba.org
Tue Jul 25 17:52:02 UTC 2017


The branch, v4-6-test has been updated
       via  fd96410 vfs_ceph: fix cephwrap_chdir()
      from  a81b8f2 s3: smbd: Fix a read after free if a chained SMB1 call goes async.

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


- Log -----------------------------------------------------------------
commit fd96410de65a588bc8db5917ea8b865718c40f6c
Author: David Disseldorp <ddiss at samba.org>
Date:   Fri Jul 14 23:55:29 2017 +0200

    vfs_ceph: fix cephwrap_chdir()
    
    When provided a '/' path (i.e. CephFS root), vfs_ceph does a *local*
    chdir() to the share path. This breaks smb client directory listings.
    
    Bug: https://bugzilla.samba.org/show_bug.cgi?id=12911
    
    Signed-off-by: David Disseldorp <ddiss at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): David Disseldorp <ddiss at samba.org>
    Autobuild-Date(master): Fri Jul 21 19:10:46 CEST 2017 on sn-devel-144
    
    (cherry picked from commit 1dcacff083019810e207a3d123a81fe32d9dde1a)
    
    Autobuild-User(v4-6-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-6-test): Tue Jul 25 19:51:08 CEST 2017 on sn-devel-144

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

Summary of changes:
 source3/modules/vfs_ceph.c | 7 -------
 1 file changed, 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_ceph.c b/source3/modules/vfs_ceph.c
index 75233ef..e3d22bf 100644
--- a/source3/modules/vfs_ceph.c
+++ b/source3/modules/vfs_ceph.c
@@ -916,13 +916,6 @@ static int cephwrap_chdir(struct vfs_handle_struct *handle,  const char *path)
 {
 	int result = -1;
 	DBG_DEBUG("[CEPH] chdir(%p, %s)\n", handle, path);
-	/*
-	 * If the path is just / use chdir because Ceph is below / and
-	 * cannot deal with changing directory above its mount point
-	 */
-	if (path && !strcmp(path, "/"))
-		return chdir(path);
-
 	result = ceph_chdir(handle->data, path);
 	DBG_DEBUG("[CEPH] chdir(...) = %d\n", result);
 	WRAP_RETURN(result);


-- 
Samba Shared Repository



More information about the samba-cvs mailing list