diff options
| author | Jeff Layton <jlayton@redhat.com> | 2011-03-31 23:22:07 +0200 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2011-05-19 16:10:50 +0200 |
| commit | fd5707e1b44560d18b47d552c1871ea0bfc46688 (patch) | |
| tree | 49881bbf211161f7523f5fed61c6f3db720917a3 /fs | |
| parent | VFS: trivial: fix comment on s_maxbytes value warning check (diff) | |
| download | linux-fd5707e1b44560d18b47d552c1871ea0bfc46688.tar.xz linux-fd5707e1b44560d18b47d552c1871ea0bfc46688.zip | |
cifs: fix comment in validate_t2
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>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/cifs/cifssmb.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c index e6374dda3c6a..64dad47641a1 100644 --- a/fs/cifs/cifssmb.c +++ b/fs/cifs/cifssmb.c @@ -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) |