Merge tag 'stable/for-linus-3.7-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / fs / cifs / sess.c

diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c
index 382c06d01b385bf618de01f0cb20a65dd25d38c0..76809f4d34284420934d85374c09a5093a5d75f3 100644 (file)
--- a/fs/cifs/sess.c
+++ b/fs/cifs/sess.c
@@ -876,7 +876,8 @@ ssetup_ntlmssp_authenticate:
        pSMB = (SESSION_SETUP_ANDX *)iov[0].iov_base;
        smb_buf = (struct smb_hdr *)iov[0].iov_base;
 
-       if ((type == RawNTLMSSP) && (smb_buf->Status.CifsError ==
+       if ((type == RawNTLMSSP) && (resp_buf_type != CIFS_NO_BUFFER) &&
+           (smb_buf->Status.CifsError ==
                        cpu_to_le32(NT_STATUS_MORE_PROCESSING_REQUIRED))) {
                if (phase != NtLmNegotiate) {
                        cERROR(1, "Unexpected more processing error");