diff options
Diffstat (limited to 'queue-6.6/cifs-fix-encoding-of-smb1-session-setup-ntlmssp-requ.patch')
| -rw-r--r-- | queue-6.6/cifs-fix-encoding-of-smb1-session-setup-ntlmssp-requ.patch | 69 |
1 files changed, 69 insertions, 0 deletions
diff --git a/queue-6.6/cifs-fix-encoding-of-smb1-session-setup-ntlmssp-requ.patch b/queue-6.6/cifs-fix-encoding-of-smb1-session-setup-ntlmssp-requ.patch new file mode 100644 index 0000000000..8a684f373b --- /dev/null +++ b/queue-6.6/cifs-fix-encoding-of-smb1-session-setup-ntlmssp-requ.patch @@ -0,0 +1,69 @@ +From f3c3113738f2c12ca7447b1c5426769357aa8371 Mon Sep 17 00:00:00 2001 +From: Sasha Levin <sashal@kernel.org> +Date: Sun, 6 Oct 2024 19:24:29 +0200 +Subject: cifs: Fix encoding of SMB1 Session Setup NTLMSSP Request in + non-UNICODE mode +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Pali Rohár <pali@kernel.org> + +[ Upstream commit 6510ef4230b68c960309e0c1d6eb3e32eb785142 ] + +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: Pali Rohár <pali@kernel.org> +Signed-off-by: Steve French <stfrench@microsoft.com> +Signed-off-by: Sasha Levin <sashal@kernel.org> +--- + fs/smb/client/sess.c | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +diff --git a/fs/smb/client/sess.c b/fs/smb/client/sess.c +index 81ac4196bb743..c351da8c3e2ea 100644 +--- a/fs/smb/client/sess.c ++++ b/fs/smb/client/sess.c +@@ -1740,22 +1740,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; +- /* 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++; ++ ++ 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); + } +- unicode_oslm_strings(&bcc_ptr, sess_data->nls_cp); + + sess_data->iov[2].iov_len = (long) bcc_ptr - + (long) sess_data->iov[2].iov_base; +-- +2.39.5 + |