From: Jule Anger <janger@samba.org>
Date: Tue, 3 Sep 2024 12:42:03 +0000 (+0200)
Subject: smbd: check negotiate before the create context is handled
X-Git-Tag: tdb-1.4.13~939
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e2324028f472a0cdc4467d08bef66f554d99189e;p=thirdparty%2Fsamba.git

smbd: check negotiate before the create context is handled

So far, the create context is used as it is sent by the client.
Now we first check whether posix extensions are negotiated.

Pair-Programmed-With: Ralph Boehme <slow@samba.org>
Signed-off-by: Jule Anger <janger@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
---

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 736c6740b35..33554fcee13 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -6931,6 +6931,56 @@ static NTSTATUS create_file_unixpath(connection_struct *conn,
 	return status;
 }
 
+static NTSTATUS check_posix_create_context(connection_struct *conn,
+				struct smb_request *req,
+				const struct smb2_create_blobs *in_context_blobs,
+				uint32_t create_options,
+				uint32_t *file_attributes)
+{
+	uint32_t wire_mode_bits = 0;
+	NTSTATUS status;
+	mode_t mode_bits = 0;
+	SMB_STRUCT_STAT sbuf = { 0 };
+	struct smb2_create_blob *posx = NULL;
+
+	if (req == NULL || !req->posix_pathnames) {
+		return NT_STATUS_OK;
+	}
+
+	posx = smb2_create_blob_find(
+		in_context_blobs, SMB2_CREATE_TAG_POSIX);
+	if (posx == NULL) {
+		return NT_STATUS_OK;
+	}
+
+	if (posx->data.length != 4) {
+		return NT_STATUS_INVALID_PARAMETER;
+	}
+
+	wire_mode_bits = IVAL(posx->data.data, 0);
+	status = unix_perms_from_wire(conn,
+				      &sbuf,
+				      wire_mode_bits,
+				      &mode_bits);
+	if (!NT_STATUS_IS_OK(status)) {
+		return status;
+	}
+	if (create_options & FILE_DIRECTORY_FILE) {
+		mode_bits = apply_conf_dir_mask(conn, mode_bits);
+	} else {
+		mode_bits = apply_conf_file_mask(conn, mode_bits);
+	}
+	/*
+	 * Remove type info from mode, leaving only the
+	 * permissions and setuid/gid bits.
+	 */
+	mode_bits &= ~S_IFMT;
+
+	*file_attributes = (FILE_FLAG_POSIX_SEMANTICS | mode_bits);
+
+	return NT_STATUS_OK;
+}
+
 NTSTATUS create_file_default(connection_struct *conn,
 			     struct smb_request *req,
 			     struct files_struct *dirfsp,
@@ -6955,7 +7005,6 @@ NTSTATUS create_file_default(connection_struct *conn,
 	files_struct *fsp = NULL;
 	NTSTATUS status;
 	bool stream_name = false;
-	struct smb2_create_blob *posx = NULL;
 
 	DBG_DEBUG("access_mask = 0x%" PRIu32
 		  " file_attributes = 0x%" PRIu32
@@ -7039,38 +7088,13 @@ NTSTATUS create_file_default(connection_struct *conn,
 		}
 	}
 
-	posx = smb2_create_blob_find(
-		in_context_blobs, SMB2_CREATE_TAG_POSIX);
-	if (posx != NULL) {
-		uint32_t wire_mode_bits = 0;
-		mode_t mode_bits = 0;
-		SMB_STRUCT_STAT sbuf = { 0 };
-
-		if (posx->data.length != 4) {
-			status = NT_STATUS_INVALID_PARAMETER;
-			goto fail;
-		}
-
-		wire_mode_bits = IVAL(posx->data.data, 0);
-		status = unix_perms_from_wire(conn,
-					      &sbuf,
-					      wire_mode_bits,
-					      &mode_bits);
-		if (!NT_STATUS_IS_OK(status)) {
-			goto fail;
-		}
-		if (create_options & FILE_DIRECTORY_FILE) {
-			mode_bits = apply_conf_dir_mask(conn, mode_bits);
-		} else {
-			mode_bits = apply_conf_file_mask(conn, mode_bits);
-		}
-		/*
-		 * Remove type info from mode, leaving only the
-		 * permissions and setuid/gid bits.
-		 */
-		mode_bits &= ~S_IFMT;
-
-		file_attributes = (FILE_FLAG_POSIX_SEMANTICS | mode_bits);
+	status = check_posix_create_context(conn,
+					    req,
+					    in_context_blobs,
+					    create_options,
+					    &file_attributes);
+	if (!NT_STATUS_IS_OK(status)) {
+		goto fail;
 	}
 
 	status = create_file_unixpath(conn,