1 files changed, 29 insertions, 8 deletions

diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
index 8f38e33d365b..29e06db5f187 100644
--- a/fs/cifs/smb2pdu.c
+++ b/fs/cifs/smb2pdu.c
@@ -588,7 +588,7 @@ SMB2_sess_setup(const unsigned int xid, struct cifs_ses *ses,
         u16 blob_length = 0;
         struct key *spnego_key = NULL;
         char *security_blob = NULL;
-        char *ntlmssp_blob = NULL;
+        unsigned char *ntlmssp_blob = NULL;
         bool use_spnego = false; /* else use raw ntlmssp */
 
         cifs_dbg(FYI, "Session Setup\n");
@@ -713,13 +713,7 @@ ssetup_ntlmssp_authenticate:
                 iov[1].iov_len = blob_length;
         } else if (phase == NtLmAuthenticate) {
                 req->hdr.SessionId = ses->Suid;
-                ntlmssp_blob = kzalloc(sizeof(struct _NEGOTIATE_MESSAGE) + 500,
-                                       GFP_KERNEL);
-                if (ntlmssp_blob == NULL) {
-                        rc = -ENOMEM;
-                        goto ssetup_exit;
-                }
-                rc = build_ntlmssp_auth_blob(ntlmssp_blob, &blob_length, ses,
+                rc = build_ntlmssp_auth_blob(&ntlmssp_blob, &blob_length, ses,
                                              nls_cp);
                 if (rc) {
                         cifs_dbg(FYI, "build_ntlmssp_auth_blob failed %d\n",
@@ -1818,6 +1812,33 @@ SMB2_echo(struct TCP_Server_Info *server)
 
         cifs_dbg(FYI, "In echo request\n");
 
+        if (server->tcpStatus == CifsNeedNegotiate) {
+                struct list_head *tmp, *tmp2;
+                struct cifs_ses *ses;
+                struct cifs_tcon *tcon;
+
+                cifs_dbg(FYI, "Need negotiate, reconnecting tcons\n");
+                spin_lock(&cifs_tcp_ses_lock);
+                list_for_each(tmp, &server->smb_ses_list) {
+                        ses = list_entry(tmp, struct cifs_ses, smb_ses_list);
+                        list_for_each(tmp2, &ses->tcon_list) {
+                                tcon = list_entry(tmp2, struct cifs_tcon,
+                                                  tcon_list);
+                                /* add check for persistent handle reconnect */
+                                if (tcon && tcon->need_reconnect) {
+                                        spin_unlock(&cifs_tcp_ses_lock);
+                                        rc = smb2_reconnect(SMB2_ECHO, tcon);
+                                        spin_lock(&cifs_tcp_ses_lock);
+                                }
+                        }
+                }
+                spin_unlock(&cifs_tcp_ses_lock);
+        }
+
+        /* if no session, renegotiate failed above */
+        if (server->tcpStatus == CifsNeedNegotiate)
+                return -EIO;
+
         rc = small_smb2_init(SMB2_ECHO, NULL, (void **)&req);
         if (rc)
                 return rc;