Browse Source

cifs: remove NULL termination from rename target in CIFSSMBRenameOpenFIle

cifs: remove NULL termination from rename target in CIFSSMBRenameOpenFIle

The rename destination isn't supposed to be null terminated. Also,
change the name string arg to be const.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Jeff Layton 16 years ago
parent
commit
391e575556
2 changed files with 3 additions and 3 deletions
  1. 1 1
      fs/cifs/cifsproto.h
  2. 2 2
      fs/cifs/cifssmb.c

+ 1 - 1
fs/cifs/cifsproto.h

@@ -231,7 +231,7 @@ extern int CIFSSMBRename(const int xid, struct cifsTconInfo *tcon,
 			const struct nls_table *nls_codepage,
 			const struct nls_table *nls_codepage,
 			int remap_special_chars);
 			int remap_special_chars);
 extern int CIFSSMBRenameOpenFile(const int xid, struct cifsTconInfo *pTcon,
 extern int CIFSSMBRenameOpenFile(const int xid, struct cifsTconInfo *pTcon,
-			int netfid, char *target_name,
+			int netfid, const char *target_name,
 			const struct nls_table *nls_codepage,
 			const struct nls_table *nls_codepage,
 			int remap_special_chars);
 			int remap_special_chars);
 extern int CIFSCreateHardLink(const int xid,
 extern int CIFSCreateHardLink(const int xid,

+ 2 - 2
fs/cifs/cifssmb.c

@@ -2017,7 +2017,7 @@ renameRetry:
 }
 }
 
 
 int CIFSSMBRenameOpenFile(const int xid, struct cifsTconInfo *pTcon,
 int CIFSSMBRenameOpenFile(const int xid, struct cifsTconInfo *pTcon,
-		int netfid, char *target_name,
+		int netfid, const char *target_name,
 		const struct nls_table *nls_codepage, int remap)
 		const struct nls_table *nls_codepage, int remap)
 {
 {
 	struct smb_com_transaction2_sfi_req *pSMB  = NULL;
 	struct smb_com_transaction2_sfi_req *pSMB  = NULL;
@@ -2071,7 +2071,7 @@ int CIFSSMBRenameOpenFile(const int xid, struct cifsTconInfo *pTcon,
 					remap);
 					remap);
 	}
 	}
 	rename_info->target_name_len = cpu_to_le32(2 * len_of_str);
 	rename_info->target_name_len = cpu_to_le32(2 * len_of_str);
-	count = 12 /* sizeof(struct set_file_rename) */ + (2 * len_of_str) + 2;
+	count = 12 /* sizeof(struct set_file_rename) */ + (2 * len_of_str);
 	byte_count += count;
 	byte_count += count;
 	pSMB->DataCount = cpu_to_le16(count);
 	pSMB->DataCount = cpu_to_le16(count);
 	pSMB->TotalDataCount = pSMB->DataCount;
 	pSMB->TotalDataCount = pSMB->DataCount;