From: Ralph Boehme <slow@samba.org>
Date: Fri, 11 Oct 2024 12:15:32 +0000 (+0200)
Subject: smbd: smbd_do_setfilepathinfo(): pass data as pointer, not pointer-to-pointer
X-Git-Tag: tdb-1.4.13~747
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a771506120f4ab08d5f2c2c58e1ca78b6e1b4aa1;p=thirdparty%2Fsamba.git

smbd: smbd_do_setfilepathinfo(): pass data as pointer, not pointer-to-pointer

No change in behaviour.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15608

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
---

diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index 8b9d663f28d..57a2b21e3e4 100644
--- a/source3/smbd/globals.h
+++ b/source3/smbd/globals.h
@@ -145,7 +145,7 @@ NTSTATUS smbd_do_setfilepathinfo(connection_struct *conn,
 				uint16_t info_level,
 				files_struct *fsp,
 				struct smb_filename *smb_fname,
-				char **ppdata,
+				char *data,
 				int total_data,
 				int *ret_data_size);
 
diff --git a/source3/smbd/smb1_trans2.c b/source3/smbd/smb1_trans2.c
index 0dba3d83df4..3413ffbf6d5 100644
--- a/source3/smbd/smb1_trans2.c
+++ b/source3/smbd/smb1_trans2.c
@@ -4596,7 +4596,7 @@ static void call_trans2setpathinfo(
 		info_level,
 		fsp,
 		smb_fname,
-		ppdata,
+		*ppdata,
 		total_data,
 		&data_return_size);
 
@@ -4772,7 +4772,7 @@ static void call_trans2setfileinfo(
 		info_level,
 		fsp,
 		smb_fname,
-		ppdata,
+		*ppdata,
 		total_data,
 		&data_return_size);
 
diff --git a/source3/smbd/smb2_setinfo.c b/source3/smbd/smb2_setinfo.c
index 9f04d020c4f..bb401970f2e 100644
--- a/source3/smbd/smb2_setinfo.c
+++ b/source3/smbd/smb2_setinfo.c
@@ -346,7 +346,7 @@ static void defer_rename_done(struct tevent_req *subreq)
 				SMB2_FILE_RENAME_INFORMATION_INTERNAL,
 				state->fsp,
 				state->fsp->fsp_name,
-				&state->data,
+				state->data,
 				state->data_size,
 				&ret_size);
 
@@ -514,7 +514,7 @@ static struct tevent_req *smbd_smb2_setinfo_send(TALLOC_CTX *mem_ctx,
 						 file_info_level,
 						 fsp,
 						 fsp->fsp_name,
-						 &data,
+						 data,
 						 data_size,
 						 &ret_size);
 		TALLOC_FREE(lck);
diff --git a/source3/smbd/smb2_trans2.c b/source3/smbd/smb2_trans2.c
index 21551cb93d8..885776a72be 100644
--- a/source3/smbd/smb2_trans2.c
+++ b/source3/smbd/smb2_trans2.c
@@ -5015,11 +5015,10 @@ NTSTATUS smbd_do_setfilepathinfo(connection_struct *conn,
 				uint16_t info_level,
 				files_struct *fsp,
 				struct smb_filename *smb_fname,
-				char **ppdata,
+				char *pdata,
 				int total_data,
 				int *ret_data_size)
 {
-	char *pdata = *ppdata;
 	NTSTATUS status = NT_STATUS_OK;
 	int data_return_size = 0;