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

Commit 540b2e37 authored by Shirish Pargaonkar's avatar Shirish Pargaonkar Committed by Steve French
Browse files

cifs: Fix regression during share-level security mounts (Repost) 



NTLM response length was changed to 16 bytes instead of 24 bytes
that are sent in Tree Connection Request during share-level security
share mounts.  Revert it back to 24 bytes.

Reported-and-Tested-by: default avatarGrzegorz Ozanski <grzegorz.ozanski@intel.com>
Acked-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarShirish Pargaonkar <shirishpargaonkar@gmail.com>
Acked-by: default avatarSuresh Jayaraman <sjayaraman@suse.de>
Cc: stable@kernel.org
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent 1cd3508d

fs/cifs/connect.c

+2 −2
Original line number Diff line number Diff line
@@ -2927,7 +2927,7 @@ CIFSTCon(unsigned int xid, struct cifsSesInfo *ses, 
		bcc_ptr++;              /* skip password */

		/* already aligned so no need to do it below */

	} else {

		pSMB->PasswordLength = cpu_to_le16(CIFS_SESS_KEY_SIZE);

		pSMB->PasswordLength = cpu_to_le16(CIFS_AUTH_RESP_SIZE);

		/* BB FIXME add code to fail this if NTLMv2 or Kerberos

		   specified as required (when that support is added to

		   the vfs in the future) as only NTLM or the much
@@ -2945,7 +2945,7 @@ CIFSTCon(unsigned int xid, struct cifsSesInfo *ses, 
#endif /* CIFS_WEAK_PW_HASH */

		SMBNTencrypt(tcon->password, ses->server->cryptkey, bcc_ptr);



		bcc_ptr += CIFS_SESS_KEY_SIZE;

		bcc_ptr += CIFS_AUTH_RESP_SIZE;

		if (ses->capabilities & CAP_UNICODE) {

			/* must align unicode strings */

			*bcc_ptr = 0; /* null byte password */