Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 391e5755 authored by Jeff Layton's avatar Jeff Layton Committed by Steve French
Browse files

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: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent 7ce86d5a

fs/cifs/cifsproto.h

+1 −1
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ extern int CIFSSMBRename(const int xid, struct cifsTconInfo *tcon, 
			const struct nls_table *nls_codepage,

			int remap_special_chars);

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,

			int remap_special_chars);

extern int CIFSCreateHardLink(const int xid,

fs/cifs/cifssmb.c

+2 −2
Original line number Diff line number Diff line
@@ -2017,7 +2017,7 @@ CIFSSMBRename(const int xid, struct cifsTconInfo *tcon, 
}



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)

{

	struct smb_com_transaction2_sfi_req *pSMB  = NULL;
@@ -2071,7 +2071,7 @@ int CIFSSMBRenameOpenFile(const int xid, struct cifsTconInfo *pTcon, 
					remap);

	}

	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;

	pSMB->DataCount = cpu_to_le16(count);

	pSMB->TotalDataCount = pSMB->DataCount;