Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9bf67e51 authored by Jeff Layton's avatar Jeff Layton Committed by Steve French
Browse files

cifs: save the dialect chosen by server 



Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent ad6cca6d

fs/cifs/cifsglob.h

+1 −0
Original line number Diff line number Diff line
@@ -185,6 +185,7 @@ struct TCP_Server_Info { 
	struct mac_key mac_signing_key;

	char ntlmv2_hash[16];

	unsigned long lstrp; /* when we got last response from this server */

	u16 dialect; /* dialect index that server chose */

};



/*

fs/cifs/cifssmb.c

+5 −6
Original line number Diff line number Diff line
@@ -355,7 +355,6 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses) 
	struct TCP_Server_Info *server;

	u16 count;

	unsigned int secFlags;

	u16 dialect;



	if (ses->server)

		server = ses->server;
@@ -408,10 +407,10 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses) 
	if (rc != 0)

		goto neg_err_exit;



	dialect = le16_to_cpu(pSMBr->DialectIndex);

	cFYI(1, "Dialect: %d", dialect);

	server->dialect = le16_to_cpu(pSMBr->DialectIndex);

	cFYI(1, "Dialect: %d", server->dialect);

	/* Check wct = 1 error case */

	if ((pSMBr->hdr.WordCount < 13) || (dialect == BAD_PROT)) {

	if ((pSMBr->hdr.WordCount < 13) || (server->dialect == BAD_PROT)) {

		/* core returns wct = 1, but we do not ask for core - otherwise

		small wct just comes when dialect index is -1 indicating we

		could not negotiate a common dialect */
@@ -419,8 +418,8 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses) 
		goto neg_err_exit;

#ifdef CONFIG_CIFS_WEAK_PW_HASH

	} else if ((pSMBr->hdr.WordCount == 13)

			&& ((dialect == LANMAN_PROT)

				|| (dialect == LANMAN2_PROT))) {

			&& ((server->dialect == LANMAN_PROT)

				|| (server->dialect == LANMAN2_PROT))) {

		__s16 tmp;

		struct lanman_neg_rsp *rsp = (struct lanman_neg_rsp *)pSMBr;