cifs: don't return error from standard_receive3 after marking response malformed
authorJeff Layton <>
Tue, 7 Feb 2012 11:31:05 +0000 (06:31 -0500)
committerGreg Kroah-Hartman <>
Mon, 20 Feb 2012 20:46:18 +0000 (12:46 -0800)
commit ff4fa4a25a33f92b5653bb43add0c63bea98d464 upstream.

standard_receive3 will check the validity of the response from the
server (via checkSMB). It'll pass the result of that check to handle_mid
which will dequeue it and mark it with a status of
MID_RESPONSE_MALFORMED if checkSMB returned an error. At that point,
standard_receive3 will also return an error, which will make the
demultiplex thread skip doing the callback for the mid.

This is wrong -- if we were able to identify the request and the
response is marked malformed, then we want the demultiplex thread to do
the callback. Fix this by making standard_receive3 return 0 in this

Reported-and-Tested-by: Mark Moseley <>
Signed-off-by: Jeff Layton <>
Signed-off-by: Steve French <>
Signed-off-by: Greg Kroah-Hartman <>

index 63e4be4..720edf5 100644 (file)
@@ -756,10 +756,11 @@ standard_receive3(struct TCP_Server_Info *server, struct mid_q_entry *mid)
                cifs_dump_mem("Bad SMB: ", buf,
                        min_t(unsigned int, server->total_read, 48));
-       if (mid)
-               handle_mid(mid, server, smb_buffer, length);
+       if (!mid)
+               return length;
-       return length;
+       handle_mid(mid, server, smb_buffer, length);
+       return 0;
 static int