mirror of
https://github.com/torvalds/linux.git
synced 2024-11-10 22:21:40 +00:00
four small client fixes
-----BEGIN PGP SIGNATURE----- iQGzBAABCgAdFiEE6fsu8pdIjtWE/DpLiiy9cAdyT1EFAmTFWPsACgkQiiy9cAdy T1FXCwwAjVij/kFLHCyt7jS6spnch2Cj3Qji6EA89/pex8ChyVONJu6uBt7/PFG3 8rrbV/cVWih+gnDe7/faBlvdjfvwWa7gHCz4eZVAV8mpVG/Pb7AqgT6mZAXPjBJi +3rTyODHOlB0oQFXcdp538LmTeXvkun+TWagUnQDTr/OAFQQiUsgpMojX5zQ636L F9fbtFdQbv5v1TQKrykYHwqjGl2Fuz1JM6AAwTzdMse+4hv2yuhzJPvYJuWG3c5H bzoFQ+nSNg2WeeKoy+njwy/xZfjc/laT/Ipb1zrrZOUC68/cawWfmA3sKYF+34UV bGSIpJK6Pckvectl3iLy9PouVYXV5odIbRyrV9WUJvvmkWm28eQSptv+H1YQNBFh fwPgcF/7YU6FfTiITxY4qUxmOmzGI2BDRVvzLlCrbUCau/Ztb5nolZRSuuciR4L+ v1tg/LJxJ3A1WgXBRfH3v0VpAxZIH/lWQbj1ZfFW1uUbKdnuCD1SsO+5QKv70DTF f43UkB/r =BsSZ -----END PGP SIGNATURE----- Merge tag '6.5-rc3-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6 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:
commit
d31e379291
@ -272,7 +272,7 @@ int unregister_nls(struct nls_table * nls)
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
static struct nls_table *find_nls(char *charset)
|
||||
static struct nls_table *find_nls(const char *charset)
|
||||
{
|
||||
struct nls_table *nls;
|
||||
spin_lock(&nls_lock);
|
||||
@ -288,7 +288,7 @@ static struct nls_table *find_nls(char *charset)
|
||||
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);
|
||||
}
|
||||
|
@ -1062,6 +1062,7 @@ struct cifs_ses {
|
||||
unsigned long chans_need_reconnect;
|
||||
/* ========= end: protected by chan_lock ======== */
|
||||
struct cifs_ses *dfs_root_ses;
|
||||
struct nls_table *local_nls;
|
||||
};
|
||||
|
||||
static inline bool
|
||||
|
@ -129,7 +129,7 @@ again:
|
||||
}
|
||||
spin_unlock(&server->srv_lock);
|
||||
|
||||
nls_codepage = load_nls_default();
|
||||
nls_codepage = ses->local_nls;
|
||||
|
||||
/*
|
||||
* need to prevent multiple threads trying to simultaneously
|
||||
@ -200,7 +200,6 @@ out:
|
||||
rc = -EAGAIN;
|
||||
}
|
||||
|
||||
unload_nls(nls_codepage);
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
@ -1842,6 +1842,10 @@ static int match_session(struct cifs_ses *ses, struct smb3_fs_context *ctx)
|
||||
CIFS_MAX_PASSWORD_LEN))
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (strcmp(ctx->local_nls->charset, ses->local_nls->charset))
|
||||
return 0;
|
||||
|
||||
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->sign = ctx->sign;
|
||||
ses->local_nls = load_nls(ctx->local_nls->charset);
|
||||
|
||||
/* add server as first channel */
|
||||
spin_lock(&ses->chan_lock);
|
||||
|
@ -478,6 +478,11 @@ long cifs_ioctl(struct file *filep, unsigned int command, unsigned long arg)
|
||||
}
|
||||
cifs_sb = CIFS_SB(inode->i_sb);
|
||||
tlink = cifs_sb_tlink(cifs_sb);
|
||||
if (IS_ERR(tlink)) {
|
||||
rc = PTR_ERR(tlink);
|
||||
break;
|
||||
}
|
||||
|
||||
tcon = tlink_tcon(tlink);
|
||||
rc = cifs_dump_full_key(tcon, (void __user *)arg);
|
||||
cifs_put_tlink(tlink);
|
||||
|
@ -95,6 +95,7 @@ sesInfoFree(struct cifs_ses *buf_to_free)
|
||||
return;
|
||||
}
|
||||
|
||||
unload_nls(buf_to_free->local_nls);
|
||||
atomic_dec(&sesInfoAllocCount);
|
||||
kfree(buf_to_free->serverOS);
|
||||
kfree(buf_to_free->serverDomain);
|
||||
|
@ -1013,6 +1013,7 @@ setup_ntlm_smb3_neg_ret:
|
||||
}
|
||||
|
||||
|
||||
/* See MS-NLMP 2.2.1.3 */
|
||||
int build_ntlmssp_auth_blob(unsigned char **pbuffer,
|
||||
u16 *buflen,
|
||||
struct cifs_ses *ses,
|
||||
@ -1047,7 +1048,8 @@ int build_ntlmssp_auth_blob(unsigned char **pbuffer,
|
||||
|
||||
flags = ses->ntlmssp->server_flags | NTLMSSP_REQUEST_TARGET |
|
||||
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);
|
||||
sec_blob->NegotiateFlags = cpu_to_le32(flags);
|
||||
|
||||
|
@ -242,7 +242,7 @@ again:
|
||||
}
|
||||
spin_unlock(&server->srv_lock);
|
||||
|
||||
nls_codepage = load_nls_default();
|
||||
nls_codepage = ses->local_nls;
|
||||
|
||||
/*
|
||||
* need to prevent multiple threads trying to simultaneously
|
||||
@ -324,7 +324,6 @@ out:
|
||||
rc = -EAGAIN;
|
||||
}
|
||||
failed:
|
||||
unload_nls(nls_codepage);
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
@ -47,7 +47,7 @@ enum utf16_endian {
|
||||
/* nls_base.c */
|
||||
extern int __register_nls(struct nls_table *, struct module *);
|
||||
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 struct nls_table *load_nls_default(void);
|
||||
#define register_nls(nls) __register_nls((nls), THIS_MODULE)
|
||||
|
Loading…
Reference in New Issue
Block a user