diff options
| author | Jeff Layton | 2011-02-01 14:40:43 +0100 |
|---|---|---|
| committer | Steve French | 2011-02-02 01:17:04 +0100 |
| commit | 9587fcff42f5bece3c0a44066b079235ee73cbb3 (patch) | |
| tree | d4af674931407f1ad9baf84391617eae4a6343c5 /fs | |
| parent | Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze (diff) | |
| download | kernel-qcow2-linux-9587fcff42f5bece3c0a44066b079235ee73cbb3.tar.gz kernel-qcow2-linux-9587fcff42f5bece3c0a44066b079235ee73cbb3.tar.xz kernel-qcow2-linux-9587fcff42f5bece3c0a44066b079235ee73cbb3.zip | |
cifs: fix length vs. total_read confusion in cifs_demultiplex_thread
length at this point is the length returned by the last kernel_recvmsg
call. total_read is the length of all of the data read so far. length
is more or less meaningless at this point, so use total_read for
everything.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Pavel Shilovsky <piastry@etersoft.ru>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/cifs/connect.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 47d8ff623683..945b2202275f 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -578,12 +578,12 @@ incomplete_rcv: else if (reconnect == 1) continue; - length += 4; /* account for rfc1002 hdr */ + total_read += 4; /* account for rfc1002 hdr */ - - dump_smb(smb_buffer, length); - if (checkSMB(smb_buffer, smb_buffer->Mid, total_read+4)) { - cifs_dump_mem("Bad SMB: ", smb_buffer, 48); + dump_smb(smb_buffer, total_read); + if (checkSMB(smb_buffer, smb_buffer->Mid, total_read)) { + cifs_dump_mem("Bad SMB: ", smb_buffer, + total_read < 48 ? total_read : 48); continue; } |