]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ksmbd: Remove unused parameter from smb2_get_name()
authorMarios Makassikis <mmakassikis@freebox.fr>
Mon, 18 Dec 2023 15:32:29 +0000 (00:32 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 23 Dec 2023 09:41:49 +0000 (10:41 +0100)
[ Upstream commit 80917f17e3f99027661a45262c310139e53a9faa ]

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

Acked-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Marios Makassikis <mmakassikis@freebox.fr>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/ksmbd/smb2pdu.c

index c7962dcaec919dfc5b02981a1021ab60164bfb96..2fb2df422d63c29f6627b462e2c6414c74002a54 100644 (file)
@@ -651,7 +651,6 @@ static void destroy_previous_session(struct ksmbd_conn *conn,
 
 /**
  * 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
@@ -659,8 +658,7 @@ static void destroy_previous_session(struct ksmbd_conn *conn,
  * 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;
 
@@ -2604,8 +2602,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)) {
@@ -5481,8 +5478,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)) {
@@ -5593,8 +5589,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)) {