From: Volker Lendecke <vl@samba.org>
Date: Thu, 3 Mar 2022 10:32:20 +0000 (+0100)
Subject: smbd: Pass dirfsp instead of an fname to open_file()
X-Git-Tag: tevent-0.12.0~560
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fbb4bd365f156fef89e96f7b79040443f0d70d0a;p=thirdparty%2Fsamba.git

smbd: Pass dirfsp instead of an fname to open_file()

Moving slowly towards passing directory handles instead of names,
representing the idea that we hold a O_PATH file descriptor on
directories.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
---

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 08c040e85db..d4fce40d16e 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -1260,7 +1260,7 @@ static NTSTATUS reopen_from_fsp(struct files_struct *fsp,
 
 static NTSTATUS open_file(files_struct *fsp,
 			  struct smb_request *req,
-			  struct smb_filename *parent_dir,
+			  struct files_struct *dirfsp,
 			  int flags,
 			  mode_t unx_mode,
 			  uint32_t access_mask, /* client requested access mask. */
@@ -1383,7 +1383,7 @@ static NTSTATUS open_file(files_struct *fsp,
 			/* Only do this check on non-stream open. */
 			if (file_existed) {
 				status = smbd_check_access_rights_fsp(
-						parent_dir->fsp,
+						dirfsp,
 						fsp,
 						false,
 						access_mask);
@@ -1421,13 +1421,14 @@ static NTSTATUS open_file(files_struct *fsp,
 				}
 
 				status = check_parent_access_fsp(
-							parent_dir->fsp,
+							dirfsp,
 							SEC_DIR_ADD_FILE);
 				if (!NT_STATUS_IS_OK(status)) {
 					DBG_DEBUG("check_parent_access_fsp on "
 						  "directory %s for file %s "
 						  "returned %s\n",
-						  smb_fname_str_dbg(parent_dir),
+						  smb_fname_str_dbg(
+							  dirfsp->fsp_name),
 						  smb_fname_str_dbg(smb_fname),
 						  nt_errstr(status));
 					return status;
@@ -1490,7 +1491,7 @@ static NTSTATUS open_file(files_struct *fsp,
 			/* Inherit the ACL if required */
 			if (lp_inherit_permissions(SNUM(conn))) {
 				inherit_access_posix_acl(conn,
-							 parent_dir->fsp,
+							 dirfsp,
 							 smb_fname,
 							 unx_mode);
 				need_re_stat = true;
@@ -1498,8 +1499,7 @@ static NTSTATUS open_file(files_struct *fsp,
 
 			/* Change the owner if required. */
 			if (lp_inherit_owner(SNUM(conn)) != INHERIT_OWNER_NO) {
-				change_file_owner_to_parent_fsp(parent_dir->fsp,
-							    fsp);
+				change_file_owner_to_parent_fsp(dirfsp, fsp);
 				need_re_stat = true;
 			}
 
@@ -1567,7 +1567,7 @@ static NTSTATUS open_file(files_struct *fsp,
 			}
 		}
 
-		status = smbd_check_access_rights_fsp(parent_dir->fsp,
+		status = smbd_check_access_rights_fsp(dirfsp,
 						      fsp,
 						      false,
 						      access_mask);
@@ -3808,7 +3808,7 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
 
 	fsp_open = open_file(fsp,
 			     req,
-			     parent_dir_fname,
+			     parent_dir_fname->fsp,
 			     flags|flags2,
 			     unx_mode,
 			     access_mask,