Commit 80917f17 authored by Marios Makassikis's avatar Marios Makassikis Committed by Steve French
Browse files

ksmbd: Remove unused parameter from smb2_get_name() 



The 'share' parameter is no longer used by smb2_get_name() since
commit 265fd199 ("ksmbd: use LOOKUP_BENEATH to prevent the out of
share access").

Acked-by: default avatarNamjae Jeon <linkinjeon@kernel.org>
Signed-off-by: default avatarMarios Makassikis <mmakassikis@freebox.fr>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 29427741

fs/ksmbd/smb2pdu.c

+4 −9
Original line number Diff line number Diff line
@@ -610,7 +610,6 @@ static void destroy_previous_session(struct ksmbd_user *user, u64 id) 


/**

 * smb2_get_name() - get filename string from on the wire smb format

 * @share:	ksmbd_share_config pointer

 * @src:	source buffer

 * @maxlen:	maxlen of source string

 * @nls_table:	nls_table pointer
@@ -618,8 +617,7 @@ static void destroy_previous_session(struct ksmbd_user *user, u64 id) 
 * Return:      matching converted filename on success, otherwise error ptr

 */

static char *

smb2_get_name(struct ksmbd_share_config *share, const char *src,

	      const int maxlen, struct nls_table *local_nls)

smb2_get_name(const char *src, const int maxlen, struct nls_table *local_nls)

{

	char *name;
@@ -2530,8 +2528,7 @@ int smb2_open(struct ksmbd_work *work) 
			goto err_out1;

		}



		name = smb2_get_name(share,

				     req->Buffer,

		name = smb2_get_name(req->Buffer,

				     le16_to_cpu(req->NameLength),

				     work->conn->local_nls);

		if (IS_ERR(name)) {
@@ -5398,8 +5395,7 @@ static int smb2_rename(struct ksmbd_work *work, 
		goto out;

	}



	new_name = smb2_get_name(share,

				 file_info->FileName,

	new_name = smb2_get_name(file_info->FileName,

				 le32_to_cpu(file_info->FileNameLength),

				 local_nls);

	if (IS_ERR(new_name)) {
@@ -5510,8 +5506,7 @@ static int smb2_create_link(struct ksmbd_work *work, 
	if (!pathname)

		return -ENOMEM;



	link_name = smb2_get_name(share,

				  file_info->FileName,

	link_name = smb2_get_name(file_info->FileName,

				  le32_to_cpu(file_info->FileNameLength),

				  local_nls);

	if (IS_ERR(link_name) || S_ISDIR(file_inode(filp)->i_mode)) {