mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-22 17:01:14 +00:00
ksmbd: move leading slash check to smb2_get_name()
commit 1cdeca6a72
upstream.
If the directory name in the root of the share starts with
character like 镜(0x955c) or Ṝ(0x1e5c), it (and anything inside)
cannot be accessed. The leading slash check must be checked after
converting unicode to nls string.
Cc: stable@vger.kernel.org
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
1efe551982
commit
83343130e3
1 changed files with 6 additions and 9 deletions
|
@ -630,6 +630,12 @@ smb2_get_name(const char *src, const int maxlen, struct nls_table *local_nls)
|
|||
return name;
|
||||
}
|
||||
|
||||
if (*name == '\\') {
|
||||
pr_err("not allow directory name included leading slash\n");
|
||||
kfree(name);
|
||||
return ERR_PTR(-EINVAL);
|
||||
}
|
||||
|
||||
ksmbd_conv_path_to_unix(name);
|
||||
ksmbd_strip_last_slash(name);
|
||||
return name;
|
||||
|
@ -2842,20 +2848,11 @@ int smb2_open(struct ksmbd_work *work)
|
|||
}
|
||||
|
||||
if (req->NameLength) {
|
||||
if ((req->CreateOptions & FILE_DIRECTORY_FILE_LE) &&
|
||||
*(char *)req->Buffer == '\\') {
|
||||
pr_err("not allow directory name included leading slash\n");
|
||||
rc = -EINVAL;
|
||||
goto err_out2;
|
||||
}
|
||||
|
||||
name = smb2_get_name((char *)req + le16_to_cpu(req->NameOffset),
|
||||
le16_to_cpu(req->NameLength),
|
||||
work->conn->local_nls);
|
||||
if (IS_ERR(name)) {
|
||||
rc = PTR_ERR(name);
|
||||
if (rc != -ENOMEM)
|
||||
rc = -ENOENT;
|
||||
name = NULL;
|
||||
goto err_out2;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue