diff options
| author | Paulo Alcantara <pc@manguebit.org> | 2026-10-11 23:59:45 -0300 |
|---|---|---|
| committer | Paulo Alcantara <pc@manguebit.org> | 2026-10-13 00:52:23 -0300 |
| commit | aadcd752e34b8afde1becd07fac4bd471dc66b5d (patch) | |
| tree | 43fb1fe2c95f0462975a411742ea5da2c36e2c32 /fs/smb/client | |
| parent | a8ef7f94f90136c1650fad5f748949f75ee44778 (diff) | |
smb: client: drop redundant nls_table arg from build_ntlmssp_smb3_negotiate_blob()
The nls codepage passed to build_ntlmssp_smb3_negotiate_blob() is always
ses->local_nls, so derive it from @ses and drop the parameter.
Signed-off-by: Paulo Alcantara <pc@manguebit.org>
Reviewed-by: David Howells <dhowells@redhat.com>
Cc: Namjae Jeon <linkinjeon@kernel.org>
Cc: Ronnie Sahlberg <ronniesahlberg@gmail.com>
Cc: Shyam Prasad N <sprasad@microsoft.com>
Cc: Tom Talpey <tom@talpey.com>
Cc: Bharath SM <bharathsm@microsoft.com>
Diffstat (limited to 'fs/smb/client')
| -rw-r--r-- | fs/smb/client/ntlmssp.h | 3 | ||||
| -rw-r--r-- | fs/smb/client/sess.c | 7 | ||||
| -rw-r--r-- | fs/smb/client/smb2pdu.c | 3 |
3 files changed, 5 insertions, 8 deletions
diff --git a/fs/smb/client/ntlmssp.h b/fs/smb/client/ntlmssp.h index 658d7795db3e..1f8c33835110 100644 --- a/fs/smb/client/ntlmssp.h +++ b/fs/smb/client/ntlmssp.h @@ -149,8 +149,7 @@ int build_ntlmssp_negotiate_blob(unsigned char **pbuffer, u16 *buflen, struct TCP_Server_Info *server); int build_ntlmssp_smb3_negotiate_blob(unsigned char **pbuffer, u16 *buflen, struct cifs_ses *ses, - struct TCP_Server_Info *server, - const struct nls_table *nls_cp); + struct TCP_Server_Info *server); int build_ntlmssp_auth_blob(unsigned char **pbuffer, u16 *buflen, struct cifs_ses *ses, struct TCP_Server_Info *server, diff --git a/fs/smb/client/sess.c b/fs/smb/client/sess.c index 01f73e540d89..86662a4dd9fa 100644 --- a/fs/smb/client/sess.c +++ b/fs/smb/client/sess.c @@ -855,8 +855,7 @@ setup_ntlm_neg_ret: int build_ntlmssp_smb3_negotiate_blob(unsigned char **pbuffer, u16 *buflen, struct cifs_ses *ses, - struct TCP_Server_Info *server, - const struct nls_table *nls_cp) + struct TCP_Server_Info *server) { int rc = 0; struct negotiate_message *sec_blob; @@ -901,13 +900,13 @@ int build_ntlmssp_smb3_negotiate_blob(unsigned char **pbuffer, NULL, CIFS_MAX_DOMAINNAME_LEN, *pbuffer, &tmp, - nls_cp); + ses->local_nls); cifs_security_buffer_from_str(&sec_blob->WorkstationName, NULL, CIFS_MAX_WORKSTATION_LEN, *pbuffer, &tmp, - nls_cp); + ses->local_nls); *buflen = tmp - *pbuffer; setup_ntlm_smb3_neg_ret: diff --git a/fs/smb/client/smb2pdu.c b/fs/smb/client/smb2pdu.c index 71d44c6da4b5..d117d61cb8c2 100644 --- a/fs/smb/client/smb2pdu.c +++ b/fs/smb/client/smb2pdu.c @@ -1833,8 +1833,7 @@ SMB2_sess_auth_rawntlmssp_negotiate(struct SMB2_sess_data *sess_data) goto out_err; rc = build_ntlmssp_smb3_negotiate_blob(&ntlmssp_blob, - &blob_length, ses, server, - sess_data->nls_cp); + &blob_length, ses, server); if (rc) goto out; |