mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 22:02:02 +00:00
ksmbd: Fix wrong return value and message length check in smb2_ioctl()
commitb1763d265a
upstream. Commitc7803b05f7
("smb3: fix ksmbd bigendian bug in oplock break, and move its struct to smbfs_common") use the defination of 'struct validate_negotiate_info_req' in smbfs_common, the array length of 'Dialects' changed from 1 to 4, but the protocol does not require the client to send all 4. This lead the request which satisfied with protocol and server to fail. So just ensure the request payload has the 'DialectCount' in smb2_ioctl(), then fsctl_validate_negotiate_info() will use it to validate the payload length and each dialect. Also when the {in, out}_buf_len is less than the required, should goto out to initialize the status in the response header. Fixes:f7db8fd03a
("ksmbd: add validation in smb2_ioctl") Cc: stable@vger.kernel.org Signed-off-by: Zhang Xiaoxu <zhangxiaoxu5@huawei.com> Acked-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
7df7cc5f99
commit
f287d4b702
1 changed files with 9 additions and 4 deletions
|
@ -7637,11 +7637,16 @@ int smb2_ioctl(struct ksmbd_work *work)
|
|||
goto out;
|
||||
}
|
||||
|
||||
if (in_buf_len < sizeof(struct validate_negotiate_info_req))
|
||||
return -EINVAL;
|
||||
if (in_buf_len < offsetof(struct validate_negotiate_info_req,
|
||||
Dialects)) {
|
||||
ret = -EINVAL;
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (out_buf_len < sizeof(struct validate_negotiate_info_rsp))
|
||||
return -EINVAL;
|
||||
if (out_buf_len < sizeof(struct validate_negotiate_info_rsp)) {
|
||||
ret = -EINVAL;
|
||||
goto out;
|
||||
}
|
||||
|
||||
ret = fsctl_validate_negotiate_info(conn,
|
||||
(struct validate_negotiate_info_req *)&req->Buffer[0],
|
||||
|
|
Loading…
Reference in a new issue