diff options
| author | Pali Rohár <pali@kernel.org> | 2024-10-06 20:24:29 +0300 |
|---|---|---|
| committer | Steve French <stfrench@microsoft.com> | 2025-06-02 04:43:40 +0300 |
| commit | 6510ef4230b68c960309e0c1d6eb3e32eb785142 (patch) | |
| tree | 361d45803f42435f897cacd4d1c9504181b9749a | |
| parent | f1e7a277a1736e12cc4bd6d93b8a5c439b8ca20c (diff) | |
| download | linux-6510ef4230b68c960309e0c1d6eb3e32eb785142.tar.xz | |
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: Pali Rohár <pali@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
| -rw-r--r-- | fs/smb/client/sess.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/fs/smb/client/sess.c b/fs/smb/client/sess.c index b3fa9ee26912..0f51d136cf23 100644 --- a/fs/smb/client/sess.c +++ b/fs/smb/client/sess.c @@ -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; - /* 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; |