ksmbd: don't need 8byte alignment for request length in ksmbd_check_message

When validating request length in ksmbd_check_message, 8byte alignment
is not needed for compound request. It can cause wrong validation
of request length.

Fixes: e2f34481b24d ("cifsd: add server-side procedures for SMB3")
Cc: stable@vger.kernel.org # v5.15
Acked-by: Hyunchul Lee <hyc.lee@gmail.com>
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>

diff --git a/fs/ksmbd/smb2misc.c b/fs/ksmbd/smb2misc.c
index 2385622cc3c8855c010a3dc9121d7aca735219b5..0239fa96926c337abf7ab747afe6b85ec600113b 100644 (file)
--- a/fs/ksmbd/smb2misc.c
+++ b/fs/ksmbd/smb2misc.c
@@ -353,12 +353,10 @@ int ksmbd_smb2_check_message(struct ksmbd_work *work)
        __u32 clc_len;  /* calculated length */
        __u32 len = get_rfc1002_len(pdu);
 
-       if (le32_to_cpu(hdr->NextCommand) > 0) {
+       if (le32_to_cpu(hdr->NextCommand) > 0)
                len = le32_to_cpu(hdr->NextCommand);
-       } else if (work->next_smb2_rcv_hdr_off) {
+       else if (work->next_smb2_rcv_hdr_off)
                len -= work->next_smb2_rcv_hdr_off;
-               len = round_up(len, 8);
-       }
 
        if (check_smb2_hdr(hdr))
                return 1;