From: Jeremy Allison <jra@samba.org>
Date: Thu, 30 Apr 2020 23:02:43 +0000 (-0700)
Subject: s3: smbd: Add a dirfsp parameter to smbd_check_access_rights().
X-Git-Tag: ldb-2.2.0~768
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49ec754fca7beaacb852facc6cfecdfedbc89e45;p=thirdparty%2Fsamba.git

s3: smbd: Add a dirfsp parameter to smbd_check_access_rights().

Not yet used. Currently always conn->cwd_fsp.

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

diff --git a/source3/modules/vfs_ceph_snapshots.c b/source3/modules/vfs_ceph_snapshots.c
index d2010d8fc52..163772e59c4 100644
--- a/source3/modules/vfs_ceph_snapshots.c
+++ b/source3/modules/vfs_ceph_snapshots.c
@@ -186,6 +186,7 @@ static int ceph_snap_enum_snapdir(struct vfs_handle_struct *handle,
 	uint32_t slots;
 
 	status = smbd_check_access_rights(handle->conn,
+					handle->conn->cwd_fsp,
 					snaps_dname,
 					false,
 					SEC_DIR_LIST);
@@ -572,6 +573,7 @@ static int ceph_snap_gmt_convert_dir(struct vfs_handle_struct *handle,
 	}
 
 	status = smbd_check_access_rights(handle->conn,
+					handle->conn->cwd_fsp,
 					snaps_dname,
 					false,
 					SEC_DIR_LIST);
diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c
index b57720a73c7..2d7fd0064de 100644
--- a/source3/modules/vfs_shadow_copy2.c
+++ b/source3/modules/vfs_shadow_copy2.c
@@ -1778,6 +1778,7 @@ static bool check_access_snapdir(struct vfs_handle_struct *handle,
 	}
 
 	status = smbd_check_access_rights(handle->conn,
+					handle->conn->cwd_fsp,
 					&smb_fname,
 					false,
 					SEC_DIR_LIST);
diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c
index 910da9d1ed0..a08bb9a55ca 100644
--- a/source3/smbd/dosmode.c
+++ b/source3/smbd/dosmode.c
@@ -536,6 +536,7 @@ NTSTATUS set_ea_dos_attribute(connection_struct *conn,
 		}
 
 		status = smbd_check_access_rights(conn,
+					conn->cwd_fsp,
 					smb_fname,
 					false,
 					FILE_WRITE_ATTRIBUTES);
diff --git a/source3/smbd/file_access.c b/source3/smbd/file_access.c
index eb9ff905781..35ee81b47dd 100644
--- a/source3/smbd/file_access.c
+++ b/source3/smbd/file_access.c
@@ -117,7 +117,12 @@ bool can_delete_file_in_directory(connection_struct *conn,
 	 * check the file DELETE permission separately.
 	 */
 
+	/*
+	 * NB. When dirfsp != conn->cwd_fsp, we must
+	 * change smb_fname_parent to be "." for the name here.
+	 */
 	ret = NT_STATUS_IS_OK(smbd_check_access_rights(conn,
+				dirfsp,
 				smb_fname_parent,
 				false,
 				FILE_DELETE_CHILD));
@@ -136,6 +141,7 @@ bool can_write_to_file(connection_struct *conn,
 {
 	SMB_ASSERT(dirfsp == conn->cwd_fsp);
 	return NT_STATUS_IS_OK(smbd_check_access_rights(conn,
+				dirfsp,
 				smb_fname,
 				false,
 				FILE_WRITE_DATA));
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 1736ecf990f..b3a8187ebc2 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -95,6 +95,7 @@ static bool parent_override_delete(connection_struct *conn,
 ****************************************************************************/
 
 NTSTATUS smbd_check_access_rights(struct connection_struct *conn,
+				struct files_struct *dirfsp,
 				const struct smb_filename *smb_fname,
 				bool use_privs,
 				uint32_t access_mask)
@@ -106,6 +107,8 @@ NTSTATUS smbd_check_access_rights(struct connection_struct *conn,
 	uint32_t rejected_mask = access_mask;
 	uint32_t do_not_check_mask = 0;
 
+	SMB_ASSERT(dirfsp == conn->cwd_fsp);
+
 	rejected_share_access = access_mask & ~(conn->share_access);
 
 	if (rejected_share_access) {
@@ -410,6 +413,7 @@ static NTSTATUS check_base_file_access(struct connection_struct *conn,
 	}
 
 	return smbd_check_access_rights(conn,
+					conn->cwd_fsp,
 					smb_fname,
 					false,
 					access_mask);
@@ -1212,6 +1216,7 @@ static NTSTATUS open_file(files_struct *fsp,
 			/* Only do this check on non-stream open. */
 			if (file_existed) {
 				status = smbd_check_access_rights(conn,
+						conn->cwd_fsp,
 						smb_fname,
 						false,
 						access_mask);
@@ -1355,6 +1360,7 @@ static NTSTATUS open_file(files_struct *fsp,
 		}
 
 		status = smbd_check_access_rights(conn,
+				conn->cwd_fsp,
 				smb_fname,
 				false,
 				access_mask);
@@ -4373,6 +4379,7 @@ static NTSTATUS open_directory(connection_struct *conn,
 
 	if (info == FILE_WAS_OPENED) {
 		status = smbd_check_access_rights(conn,
+						conn->cwd_fsp,
 						smb_dname,
 						false,
 						access_mask);
diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 931d2fd2cdd..c2f0e2e184e 100644
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -703,6 +703,7 @@ void reply_nttranss(struct smb_request *req);
 /* The following definitions come from smbd/open.c  */
 
 NTSTATUS smbd_check_access_rights(struct connection_struct *conn,
+				struct files_struct *dirfsp,
 				const struct smb_filename *smb_fname,
 				bool use_privs,
 				uint32_t access_mask);
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index aa84be99159..f8c0124cbb8 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -1554,6 +1554,7 @@ void reply_setatr(struct smb_request *req)
 			mode &= ~FILE_ATTRIBUTE_DIRECTORY;
 
 		status = smbd_check_access_rights(conn,
+					conn->cwd_fsp,
 					smb_fname,
 					false,
 					FILE_WRITE_ATTRIBUTES);
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 7d1fe8ba05c..65c50336f6f 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -202,6 +202,7 @@ static NTSTATUS check_access(connection_struct *conn,
 {
 	SMB_ASSERT(dirfsp == dirfsp->conn->cwd_fsp);
 	return smbd_check_access_rights(conn,
+			dirfsp,
 			smb_fname,
 			false,
 			access_mask);