cifs: Process post session setup code in respective dialect functions.

Move the post (successful) session setup code to respective dialect routines.

For smb1, session key is per smb connection.
For smb2/smb3, session key is per smb session.

If client and server do not require signing, free session key for smb1/2/3.

If client and server require signing
  smb1 - Copy (kmemdup) session key for the first session to connection.
         Free session key of that and subsequent sessions on this connection.
  smb2 - For every session, keep the session key and free it when the
         session is being shutdown.
  smb3 - For every session, generate the smb3 signing key using the session key
         and then free the session key.

There are two unrelated line formatting changes as well.

Reviewed-by: Jeff Layton <jlayton@samba.org>
Signed-off-by: Shirish Pargaonkar <shirishpargaonkar@gmail.com>
Signed-off-by: Steve French <smfrench@gmail.com>

1 files changed, 31 insertions, 0 deletions

diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
index 7d56a5ca2abb..f56cf99e027a 100644
--- a/fs/cifs/smb2pdu.c
+++ b/fs/cifs/smb2pdu.c
@@ -478,6 +478,13 @@ SMB2_sess_setup(const unsigned int xid, struct cifs_ses *ses,
         }
 
         /*
+         * If we are here due to reconnect, free per-smb session key
+         * in case signing was required.
+         */
+        kfree(ses->auth_key.response);
+        ses->auth_key.response = NULL;
+
+        /*
          * If memory allocation is successful, caller of this function
          * frees it.
          */
@@ -628,6 +635,30 @@ ssetup_exit:
         /* if ntlmssp, and negotiate succeeded, proceed to authenticate phase */
         if ((phase == NtLmChallenge) && (rc == 0))
                 goto ssetup_ntlmssp_authenticate;
+
+        if (!rc) {
+                mutex_lock(&server->srv_mutex);
+                if (!server->session_estab) {
+                        server->sequence_number = 0x2;
+                        server->session_estab = true;
+                        if (server->ops->generate_signingkey)
+                                server->ops->generate_signingkey(server);
+                }
+                mutex_unlock(&server->srv_mutex);
+
+                cifs_dbg(FYI, "SMB2/3 session established successfully\n");
+                spin_lock(&GlobalMid_Lock);
+                ses->status = CifsGood;
+                ses->need_reconnect = false;
+                spin_unlock(&GlobalMid_Lock);
+        }
+
+        if (!server->sign) {
+                kfree(ses->auth_key.response);
+                ses->auth_key.response = NULL;
+        }
+        kfree(ses->ntlmssp);
+
         return rc;
 }