From: Jeremy Allison <jra@samba.org>
Date: Tue, 19 Jan 2021 19:04:12 +0000 (-0800)
Subject: s3: VFS: ceph: Fix cephwrap_linkat() to cope with real directory fsps.
X-Git-Tag: tevent-0.11.0~1795
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ea027e314ab2e9fc62ece7ef77bc9d03942cad70;p=thirdparty%2Fsamba.git

s3: VFS: ceph: Fix cephwrap_linkat() to cope with real directory fsps.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Böhme <slow@samba.org>
---

diff --git a/source3/modules/vfs_ceph.c b/source3/modules/vfs_ceph.c
index a34ed8eab14..9da074a31ce 100644
--- a/source3/modules/vfs_ceph.c
+++ b/source3/modules/vfs_ceph.c
@@ -1108,18 +1108,34 @@ static int cephwrap_linkat(struct vfs_handle_struct *handle,
 		const struct smb_filename *new_smb_fname,
 		int flags)
 {
+	struct smb_filename *full_fname_old = NULL;
+	struct smb_filename *full_fname_new = NULL;
 	int result = -1;
-	DBG_DEBUG("[CEPH] link(%p, %s, %s)\n", handle,
-			old_smb_fname->base_name,
-			new_smb_fname->base_name);
 
-	SMB_ASSERT(srcfsp == srcfsp->conn->cwd_fsp);
-	SMB_ASSERT(dstfsp == dstfsp->conn->cwd_fsp);
+	full_fname_old = full_path_from_dirfsp_atname(talloc_tos(),
+					srcfsp,
+					old_smb_fname);
+	if (full_fname_old == NULL) {
+		return -1;
+	}
+	full_fname_new = full_path_from_dirfsp_atname(talloc_tos(),
+					dstfsp,
+					new_smb_fname);
+	if (full_fname_new == NULL) {
+		TALLOC_FREE(full_fname_old);
+		return -1;
+	}
+
+	DBG_DEBUG("[CEPH] link(%p, %s, %s)\n", handle,
+			full_fname_old->base_name,
+			full_fname_new->base_name);
 
 	result = ceph_link(handle->data,
-				old_smb_fname->base_name,
-				new_smb_fname->base_name);
+				full_fname_old->base_name,
+				full_fname_new->base_name);
 	DBG_DEBUG("[CEPH] link(...) = %d\n", result);
+	TALLOC_FREE(full_fname_old);
+	TALLOC_FREE(full_fname_new);
 	WRAP_RETURN(result);
 }