Commit a19f316
ksmbd: Fix wrong return value and message length check in smb2_ioctl()
commit b1763d2 upstream.
Commit c7803b0 ("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: f7db8fd ("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>1 parent 39b6855 commit a19f316
1 file changed
+9
-4
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7617 | 7617 | | |
7618 | 7618 | | |
7619 | 7619 | | |
7620 | | - | |
7621 | | - | |
| 7620 | + | |
| 7621 | + | |
| 7622 | + | |
| 7623 | + | |
| 7624 | + | |
7622 | 7625 | | |
7623 | | - | |
7624 | | - | |
| 7626 | + | |
| 7627 | + | |
| 7628 | + | |
| 7629 | + | |
7625 | 7630 | | |
7626 | 7631 | | |
7627 | 7632 | | |
| |||
0 commit comments