UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

cifs: handle errors from coalesce_t2 

cifs_demultiplex_thread calls coalesce_t2 to try and merge follow-on t2
responses into the original mid buffer. coalesce_t2 however can return
errors, but the caller doesn't handle that situation properly. Fix the
thread to treat such a case as it would a malformed packet. Mark the
mid as being malformed and issue the callback.

Cc: stable@kernel.org
Acked-by: David Howells <dhowells@redhat.com>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
This commit is contained in:
Jeff Layton 2011-04-29 06:52:44 -04:00 committed by Steve French
parent 146f9f65bd
commit 16541ba11c
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/cifs/connect.c
View File

@ -630,12 +630,16 @@ incomplete_rcv:
isMultiRsp = true; isMultiRsp = true;
if (mid_entry->resp_buf) { if (mid_entry->resp_buf) {
/* merge response - fix up 1st*/ /* merge response - fix up 1st*/
if (coalesce_t2(smb_buffer, length = coalesce_t2(smb_buffer,
mid_entry->resp_buf)) { mid_entry->resp_buf);
if (length > 0) {
length = 0;
mid_entry->multiRsp = true; mid_entry->multiRsp = true;
break; break;
} else { } else {
/* all parts received */ /* all parts received or
* packet is malformed
*/
mid_entry->multiEnd = true; mid_entry->multiEnd = true;
goto multi_t2_fnd; goto multi_t2_fnd;
} }