aleph/lkl_linux
1
0
Fork 0
mirror of https://github.com/lkl/linux.git synced 2025-12-19 16:13:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag '6.5-rc3-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6

Browse Source 
Pull smb client fixes from Steve French:
 "Four small SMB3 client fixes:

   - two reconnect fixes (to address the case where non-default
     iocharset gets incorrectly overridden at reconnect with the
     default charset)

   - fix for NTLMSSP_AUTH request setting a flag incorrectly)

   - Add missing check for invalid tlink (tree connection) in ioctl"

* tag '6.5-rc3-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: add missing return value check for cifs_sb_tlink
  smb3: do not set NTLMSSP_VERSION flag for negotiate not auth request
  cifs: fix charset issue in reconnection
  fs/nls: make load_nls() take a const parameter
This commit is contained in:
Linus Torvalds
2023-07-29 20:49:13 -07:00
parent b88e123cc0 a171eb5cac
commit d31e379291
9 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fs/nls/nls_base.c
View File

@@ -272,7 +272,7 @@ int unregister_nls(struct nls_table * nls)
return -EINVAL; return -EINVAL;
} }
static struct nls_table *find_nls(char *charset) static struct nls_table *find_nls(const char *charset)
{ {
struct nls_table *nls; struct nls_table *nls;
spin_lock(&nls_lock); spin_lock(&nls_lock);
@@ -288,7 +288,7 @@ static struct nls_table *find_nls(char *charset)
return nls; return nls;
} }
struct nls_table *load_nls(char *charset) struct nls_table *load_nls(const char *charset)
{ {
return try_then_request_module(find_nls(charset), "nls_%s", charset); return try_then_request_module(find_nls(charset), "nls_%s", charset);
} }

1
fs/smb/client/cifsglob.h
View File

@@ -1062,6 +1062,7 @@ struct cifs_ses {
unsigned long chans_need_reconnect; unsigned long chans_need_reconnect;
/* ========= end: protected by chan_lock ======== */ /* ========= end: protected by chan_lock ======== */
struct cifs_ses *dfs_root_ses; struct cifs_ses *dfs_root_ses;
struct nls_table *local_nls;
}; };
static inline bool static inline bool

3
fs/smb/client/cifssmb.c
View File

@@ -129,7 +129,7 @@ again:
} }
spin_unlock(&server->srv_lock); spin_unlock(&server->srv_lock);
nls_codepage = load_nls_default(); nls_codepage = ses->local_nls;
/* /*
* need to prevent multiple threads trying to simultaneously * need to prevent multiple threads trying to simultaneously
@@ -200,7 +200,6 @@ out:
rc = -EAGAIN; rc = -EAGAIN;
} }
unload_nls(nls_codepage);
return rc; return rc;
} }

5
fs/smb/client/connect.c
View File

@@ -1842,6 +1842,10 @@ static int match_session(struct cifs_ses *ses, struct smb3_fs_context *ctx)
CIFS_MAX_PASSWORD_LEN)) CIFS_MAX_PASSWORD_LEN))
return 0; return 0;
} }
if (strcmp(ctx->local_nls->charset, ses->local_nls->charset))
return 0;
return 1; return 1;
} }
@@ -2286,6 +2290,7 @@ cifs_get_smb_ses(struct TCP_Server_Info *server, struct smb3_fs_context *ctx)
ses->sectype = ctx->sectype; ses->sectype = ctx->sectype;
ses->sign = ctx->sign; ses->sign = ctx->sign;
ses->local_nls = load_nls(ctx->local_nls->charset);
/* add server as first channel */ /* add server as first channel */
spin_lock(&ses->chan_lock); spin_lock(&ses->chan_lock);

5
fs/smb/client/ioctl.c
View File

@@ -478,6 +478,11 @@ long cifs_ioctl(struct file *filep, unsigned int command, unsigned long arg)
} }
cifs_sb = CIFS_SB(inode->i_sb); cifs_sb = CIFS_SB(inode->i_sb);
tlink = cifs_sb_tlink(cifs_sb); tlink = cifs_sb_tlink(cifs_sb);
if (IS_ERR(tlink)) {
rc = PTR_ERR(tlink);
break;
}
tcon = tlink_tcon(tlink); tcon = tlink_tcon(tlink);
rc = cifs_dump_full_key(tcon, (void __user *)arg); rc = cifs_dump_full_key(tcon, (void __user *)arg);
cifs_put_tlink(tlink); cifs_put_tlink(tlink);

1
fs/smb/client/misc.c
View File

@@ -95,6 +95,7 @@ sesInfoFree(struct cifs_ses *buf_to_free)
return; return;
} }
unload_nls(buf_to_free->local_nls);
atomic_dec(&sesInfoAllocCount); atomic_dec(&sesInfoAllocCount);
kfree(buf_to_free->serverOS); kfree(buf_to_free->serverOS);
kfree(buf_to_free->serverDomain); kfree(buf_to_free->serverDomain);

4
fs/smb/client/sess.c
View File

@@ -1013,6 +1013,7 @@ setup_ntlm_smb3_neg_ret:
} }
/* See MS-NLMP 2.2.1.3 */
int build_ntlmssp_auth_blob(unsigned char **pbuffer, int build_ntlmssp_auth_blob(unsigned char **pbuffer,
u16 *buflen, u16 *buflen,
struct cifs_ses *ses, struct cifs_ses *ses,
@@ -1047,7 +1048,8 @@ int build_ntlmssp_auth_blob(unsigned char **pbuffer,
flags = ses->ntlmssp->server_flags | NTLMSSP_REQUEST_TARGET | flags = ses->ntlmssp->server_flags | NTLMSSP_REQUEST_TARGET |
NTLMSSP_NEGOTIATE_TARGET_INFO | NTLMSSP_NEGOTIATE_WORKSTATION_SUPPLIED; NTLMSSP_NEGOTIATE_TARGET_INFO | NTLMSSP_NEGOTIATE_WORKSTATION_SUPPLIED;
/* we only send version information in ntlmssp negotiate, so do not set this flag */
flags = flags & ~NTLMSSP_NEGOTIATE_VERSION;
tmp = *pbuffer + sizeof(AUTHENTICATE_MESSAGE); tmp = *pbuffer + sizeof(AUTHENTICATE_MESSAGE);
sec_blob->NegotiateFlags = cpu_to_le32(flags); sec_blob->NegotiateFlags = cpu_to_le32(flags);

3
fs/smb/client/smb2pdu.c
View File

@@ -242,7 +242,7 @@ again:
} }
spin_unlock(&server->srv_lock); spin_unlock(&server->srv_lock);
nls_codepage = load_nls_default(); nls_codepage = ses->local_nls;
/* /*
* need to prevent multiple threads trying to simultaneously * need to prevent multiple threads trying to simultaneously
@@ -324,7 +324,6 @@ out:
rc = -EAGAIN; rc = -EAGAIN;
} }
failed: failed:
unload_nls(nls_codepage);
return rc; return rc;
} }

2
include/linux/nls.h
View File

@@ -47,7 +47,7 @@ enum utf16_endian {
/* nls_base.c */ /* nls_base.c */
extern int __register_nls(struct nls_table *, struct module *); extern int __register_nls(struct nls_table *, struct module *);
extern int unregister_nls(struct nls_table *); extern int unregister_nls(struct nls_table *);
extern struct nls_table *load_nls(char *); extern struct nls_table *load_nls(const char *charset);
extern void unload_nls(struct nls_table *); extern void unload_nls(struct nls_table *);
extern struct nls_table *load_nls_default(void); extern struct nls_table *load_nls_default(void);
#define register_nls(nls) __register_nls((nls), THIS_MODULE) #define register_nls(nls) __register_nls((nls), THIS_MODULE)