cifs: fix comment in validate_t2
authorJeff Layton <jlayton@redhat.com>
Thu, 31 Mar 2011 21:22:07 +0000 (17:22 -0400)
committerSteve French <sfrench@us.ibm.com>
Thu, 19 May 2011 14:10:50 +0000 (14:10 +0000)
The comment about checking the bcc is in the wrong place. Also make it
match kernel coding style.

Reported-and-acked-by: David Howells <dhowells@redhat.com>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
fs/cifs/cifssmb.c

index e6374dd..64dad47 100644 (file)
@@ -339,12 +339,13 @@ static int validate_t2(struct smb_t2_rsp *pSMB)
            get_unaligned_le16(&pSMB->t2_rsp.DataOffset) > 1024)
                goto vt2_err;
 
-       /* check that bcc is at least as big as parms + data */
-       /* check that bcc is less than negotiated smb buffer */
        total_size = get_unaligned_le16(&pSMB->t2_rsp.ParameterCount);
        if (total_size >= 512)
                goto vt2_err;
 
+       /* check that bcc is at least as big as parms + data, and that it is
+        * less than negotiated smb buffer
+        */
        total_size += get_unaligned_le16(&pSMB->t2_rsp.DataCount);
        if (total_size > get_bcc(&pSMB->hdr) ||
            total_size >= CIFSMaxBufSize + MAX_CIFS_HDR_SIZE)