ksmbd: Fix wrong return value and message length check in smb2_ioctl()

Commit 89ddffe47436 ("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: efeb37237364 ("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>

diff --git a/fs/ksmbd/smb2pdu.c b/fs/ksmbd/smb2pdu.c
index f99698ce955b0e09816776e01c65e981cb7459ef..d0a0595bb01b3dfd0b21dce255ddb9910777f70e 100644 (file)
--- a/fs/ksmbd/smb2pdu.c
+++ b/fs/ksmbd/smb2pdu.c
@@ -7659,11 +7659,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],