From: Ralph Boehme <slow@samba.org>
Date: Wed, 20 May 2020 20:48:36 +0000 (+0200)
Subject: vfs_shadow_copy2: use SMB_VFS_NEXT_OPENAT() in shadow_copy2_get_shadow_copy_data()
X-Git-Tag: ldb-2.2.0~372
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=643a441edbf3ff1707e5b4c1e2966af6d5aed927;p=thirdparty%2Fsamba.git

vfs_shadow_copy2: use SMB_VFS_NEXT_OPENAT() in shadow_copy2_get_shadow_copy_data()

These are paths not under user control, so it should be safe to call it with
AT_FDCWD and multi-component paths.

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

diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c
index 119c8458e55..d9ac83b1ba7 100644
--- a/source3/modules/vfs_shadow_copy2.c
+++ b/source3/modules/vfs_shadow_copy2.c
@@ -2007,6 +2007,7 @@ static int shadow_copy2_get_shadow_copy_data(
 	const char *snapdir;
 	struct smb_filename *snapdir_smb_fname = NULL;
 	struct files_struct *dirfsp = NULL;
+	struct files_struct *fspcwd = NULL;
 	struct dirent *d;
 	TALLOC_CTX *tmp_ctx = talloc_stackframe();
 	struct shadow_copy2_private *priv = NULL;
@@ -2053,15 +2054,22 @@ static int shadow_copy2_get_shadow_copy_data(
 		goto done;
 	}
 
+	status = vfs_at_fspcwd(talloc_tos(), handle->conn, &fspcwd);
+	if (!NT_STATUS_IS_OK(status)) {
+		errno = ENOMEM;
+		goto done;
+	}
+
 #ifdef O_DIRECTORY
 	open_flags |= O_DIRECTORY;
 #endif
 
-	dirfsp->fh->fd = SMB_VFS_NEXT_OPEN(handle,
-					   snapdir_smb_fname,
-					   dirfsp,
-					   open_flags,
-					   0);
+	dirfsp->fh->fd = SMB_VFS_NEXT_OPENAT(handle,
+					     fspcwd,
+					     snapdir_smb_fname,
+					     dirfsp,
+					     open_flags,
+					     0);
 	if (dirfsp->fh->fd == -1) {
 		DBG_WARNING("SMB_VFS_NEXT_OPEN failed for '%s'"
 			    " - %s\n", snapdir, strerror(errno));
@@ -2167,6 +2175,7 @@ static int shadow_copy2_get_shadow_copy_data(
 	ret = 0;
 
 done:
+	TALLOC_FREE(fspcwd );
 	if (p != NULL) {
 		SMB_VFS_NEXT_CLOSEDIR(handle, p);
 		p = NULL;