From: Volker Lendecke <vl@samba.org>
Date: Sat, 10 Sep 2022 08:36:11 +0000 (-0700)
Subject: smbd: Slightly simplify non_widelink_open()
X-Git-Tag: talloc-2.4.0~953
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4445ef9ab1b258fbb17bb5aaa9998f14e4adfcc;p=thirdparty%2Fsamba.git

smbd: Slightly simplify non_widelink_open()

Avoid the "is_share_root" boolean: One special case less to take care
of further down and in callers: Sanitize the relative name so that it
can never contain a path separator

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 463f8809abc..5dd43ee4c55 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -694,7 +694,6 @@ static NTSTATUS non_widelink_open(const struct files_struct *dirfsp,
 	struct smb_filename *oldwd_fname = NULL;
 	struct smb_filename *parent_dir_fname = NULL;
 	bool have_opath = false;
-	bool is_share_root = false;
 	struct vfs_open_how how = *_how;
 	int ret;
 
@@ -710,11 +709,19 @@ static NTSTATUS non_widelink_open(const struct files_struct *dirfsp,
 		int cmp = strcmp(connpath, smb_fname->base_name);
 
 		if (cmp == 0) {
-			is_share_root = true;
+			/*
+			 * We're on the share root, reflect this in
+			 * smb_fname
+			 */
+			smb_fname->base_name = talloc_strdup(smb_fname, "");
+			if (smb_fname->base_name == NULL) {
+				status = NT_STATUS_NO_MEMORY;
+				goto out;
+			}
 		}
 	}
 
-	if (!is_share_root && (dirfsp == conn->cwd_fsp)) {
+	if (dirfsp == conn->cwd_fsp) {
 		struct smb_filename *smb_fname_dot = NULL;
 
 		status = SMB_VFS_PARENT_PATHNAME(fsp->conn,
@@ -769,10 +776,7 @@ static NTSTATUS non_widelink_open(const struct files_struct *dirfsp,
 		smb_fname_rel = smb_fname;
 	}
 
-	if (!is_share_root) {
-		char *slash = strchr_m(smb_fname_rel->base_name, '/');
-		SMB_ASSERT(slash == NULL);
-	}
+	SMB_ASSERT(strchr_m(smb_fname_rel->base_name, '/') == NULL);
 
 	how.flags |= O_NOFOLLOW;