Commit f6a6bf7c authored by Aurelien Aptel's avatar Aurelien Aptel Committed by Steve French
Browse files

cifs: switch servers depending on binding state 



Currently a lot of the code to initialize a connection & session uses
the cifs_ses as input. But depending on if we are opening a new session
or a new channel we need to use different server pointers.

Add a "binding" flag in cifs_ses and a helper function that returns
the server ptr a session should use (only in the sess establishment
code path).

Signed-off-by: default avatarAurelien Aptel <aaptel@suse.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent f780bd3f

fs/cifs/cifs_spnego.c

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ struct key_type cifs_spnego_key_type = { 
struct key *

cifs_get_spnego_key(struct cifs_ses *sesInfo)

{

	struct TCP_Server_Info *server = sesInfo->server;

	struct TCP_Server_Info *server = cifs_ses_server(sesInfo);

	struct sockaddr_in *sa = (struct sockaddr_in *) &server->dstaddr;

	struct sockaddr_in6 *sa6 = (struct sockaddr_in6 *) &server->dstaddr;

	char *description, *dp;

fs/cifs/cifsglob.h

+10 −0
Original line number Diff line number Diff line
@@ -994,6 +994,7 @@ struct cifs_ses { 
	bool sign;		/* is signing required? */

	bool need_reconnect:1; /* connection reset, uid now invalid */

	bool domainAuto:1;

	bool binding:1; /* are we binding the session? */

	__u16 session_flags;

	__u8 smb3signingkey[SMB3_SIGN_KEY_SIZE];

	__u8 smb3encryptionkey[SMB3_SIGN_KEY_SIZE];
@@ -1021,6 +1022,15 @@ struct cifs_ses { 
	atomic_t chan_seq; /* round robin state */

};



static inline

struct TCP_Server_Info *cifs_ses_server(struct cifs_ses *ses)

{

	if (ses->binding)

		return ses->chans[ses->chan_count].server;

	else

		return ses->server;

}



static inline bool

cap_unix(struct cifs_ses *ses)

{

fs/cifs/connect.c

+2 −2
Original line number Diff line number Diff line
@@ -5185,7 +5185,7 @@ int 
cifs_negotiate_protocol(const unsigned int xid, struct cifs_ses *ses)

{

	int rc = 0;

	struct TCP_Server_Info *server = ses->server;

	struct TCP_Server_Info *server = cifs_ses_server(ses);



	if (!server->ops->need_neg || !server->ops->negotiate)

		return -ENOSYS;
@@ -5212,7 +5212,7 @@ cifs_setup_session(const unsigned int xid, struct cifs_ses *ses, 
		   struct nls_table *nls_info)

{

	int rc = -ENOSYS;

	struct TCP_Server_Info *server = ses->server;

	struct TCP_Server_Info *server = cifs_ses_server(ses);



	ses->capabilities = server->capabilities;

	if (linuxExtEnabled == 0)

fs/cifs/sess.c

+3 −2
Original line number Diff line number Diff line
@@ -342,6 +342,7 @@ int decode_ntlmssp_challenge(char *bcc_ptr, int blob_len, 
void build_ntlmssp_negotiate_blob(unsigned char *pbuffer,

					 struct cifs_ses *ses)

{

	struct TCP_Server_Info *server = cifs_ses_server(ses);

	NEGOTIATE_MESSAGE *sec_blob = (NEGOTIATE_MESSAGE *)pbuffer;

	__u32 flags;
@@ -354,9 +355,9 @@ void build_ntlmssp_negotiate_blob(unsigned char *pbuffer, 
		NTLMSSP_NEGOTIATE_128 | NTLMSSP_NEGOTIATE_UNICODE |

		NTLMSSP_NEGOTIATE_NTLM | NTLMSSP_NEGOTIATE_EXTENDED_SEC |

		NTLMSSP_NEGOTIATE_SEAL;

	if (ses->server->sign)

	if (server->sign)

		flags |= NTLMSSP_NEGOTIATE_SIGN;

	if (!ses->server->session_estab || ses->ntlmssp->sesskey_per_smbsess)

	if (!server->session_estab || ses->ntlmssp->sesskey_per_smbsess)

		flags |= NTLMSSP_NEGOTIATE_KEY_XCH;



	sec_blob->NegotiateFlags = cpu_to_le32(flags);

fs/cifs/smb2ops.c

+1 −1
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ smb2_negotiate(const unsigned int xid, struct cifs_ses *ses) 
{

	int rc;



	ses->server->CurrentMid = 0;

	cifs_ses_server(ses)->CurrentMid = 0;

	rc = SMB2_negotiate(xid, ses);

	/* BB we probably don't need to retry with modern servers */

	if (rc == -EAGAIN)

CRA Git | Maintained and supported by SUSTech CRA and CCSE