Commit 6510ef42 authored by Pali Rohár's avatar Pali Rohár Committed by Steve French
Browse files

cifs: Fix encoding of SMB1 Session Setup NTLMSSP Request in non-UNICODE mode 



SMB1 Session Setup NTLMSSP Request in non-UNICODE mode is similar to
UNICODE mode, just strings are encoded in ASCII and not in UTF-16.

With this change it is possible to setup SMB1 session with NTLM
authentication in non-UNICODE mode with Windows SMB server.

This change fixes mounting SMB1 servers with -o nounicode mount option
together with -o sec=ntlmssp mount option (which is the default sec=).

Signed-off-by: default avatarPali Rohár <pali@kernel.org>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent f1e7a277

fs/smb/client/sess.c

+10 −10
Original line number Diff line number Diff line
@@ -1684,22 +1684,22 @@ _sess_auth_rawntlmssp_assemble_req(struct sess_data *sess_data) 
	pSMB = (SESSION_SETUP_ANDX *)sess_data->iov[0].iov_base;



	capabilities = cifs_ssetup_hdr(ses, server, pSMB);

	if ((pSMB->req.hdr.Flags2 & SMBFLG2_UNICODE) == 0) {

		cifs_dbg(VFS, "NTLMSSP requires Unicode support\n");

		return -ENOSYS;

	}



	pSMB->req.hdr.Flags2 |= SMBFLG2_EXT_SEC;

	capabilities |= CAP_EXTENDED_SECURITY;

	pSMB->req.Capabilities |= cpu_to_le32(capabilities);



	bcc_ptr = sess_data->iov[2].iov_base;



	if (pSMB->req.hdr.Flags2 & SMBFLG2_UNICODE) {

		/* unicode strings must be word aligned */

		if (!IS_ALIGNED(sess_data->iov[0].iov_len + sess_data->iov[1].iov_len, 2)) {

			*bcc_ptr = 0;

			bcc_ptr++;

		}

		unicode_oslm_strings(&bcc_ptr, sess_data->nls_cp);

	} else {

		ascii_oslm_strings(&bcc_ptr, sess_data->nls_cp);

	}



	sess_data->iov[2].iov_len = (long) bcc_ptr -

					(long) sess_data->iov[2].iov_base;