mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 22:02:02 +00:00
two cifs/smb3 fixes, one fscache related, and one mount parsing related for stable
-----BEGIN PGP SIGNATURE----- iQGzBAABCgAdFiEE6fsu8pdIjtWE/DpLiiy9cAdyT1EFAmG9V/0ACgkQiiy9cAdy T1GbQAv+N/2p7mMzhxcB91xlU6DSo2kZhC1FcmiXld3BEiMzkef6Rtb/lzW1AtBP kNgqjVU7MMmdFQNKLhrHUV2BNCtLWKOC2I0xTZqr+nBlGMJkiNUBzUWW8DcnLd1e zGky7Wck8HHu7LdnZA3TVlPhNV9KjdlHMEYBBJFlOc779a/Q0KyHLdwhP9mpSa2d QrVRHkBMylNUqF4WiLKQ0I8eJFhKtd7pJNAW1qGeKe2YDV6kZQiXwHOLIZb7SHET 9Qtj83IwsQ13cLTmb7tGibj0Fn+GEEqgBv40PjSMuTCoiCpfhcLrx0lWT5hxlxao 9w3Yw1pPPaJXbxCmL9b3Bqm3vnNqMaN7HqxsuGIFwnulGFB4GJY2l+ZQPcTHzWG0 oCHlimlixH7RKVEfjIDhidC1C0ReZI8/1XuHPGE17Ysxt6L7dH/a7J2y7SlIdYTZ ZVvVT0Kib74I7ZUJH1ymc4MdAVnBIkiTGOrQk/FU+cHOyzMUpNcwXiCqkvF77QUa hDW4hkzE =MW5I -----END PGP SIGNATURE----- Merge tag '5.16-rc5-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6 Pull cifs fixes from Steve French: "Two cifs/smb3 fixes, one fscache related, and one mount parsing related for stable" * tag '5.16-rc5-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6: cifs: sanitize multiple delimiters in prepath cifs: ignore resource_id while getting fscache super cookie
This commit is contained in:
commit
9273d6cb99
3 changed files with 44 additions and 14 deletions
|
@ -3064,6 +3064,13 @@ static int mount_get_conns(struct mount_ctx *mnt_ctx)
|
||||||
(cifs_sb->ctx->rsize > server->ops->negotiate_rsize(tcon, ctx)))
|
(cifs_sb->ctx->rsize > server->ops->negotiate_rsize(tcon, ctx)))
|
||||||
cifs_sb->ctx->rsize = server->ops->negotiate_rsize(tcon, ctx);
|
cifs_sb->ctx->rsize = server->ops->negotiate_rsize(tcon, ctx);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* The cookie is initialized from volume info returned above.
|
||||||
|
* Inside cifs_fscache_get_super_cookie it checks
|
||||||
|
* that we do not get super cookie twice.
|
||||||
|
*/
|
||||||
|
cifs_fscache_get_super_cookie(tcon);
|
||||||
|
|
||||||
out:
|
out:
|
||||||
mnt_ctx->server = server;
|
mnt_ctx->server = server;
|
||||||
mnt_ctx->ses = ses;
|
mnt_ctx->ses = ses;
|
||||||
|
|
|
@ -434,6 +434,42 @@ int smb3_parse_opt(const char *options, const char *key, char **val)
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Remove duplicate path delimiters. Windows is supposed to do that
|
||||||
|
* but there are some bugs that prevent rename from working if there are
|
||||||
|
* multiple delimiters.
|
||||||
|
*
|
||||||
|
* Returns a sanitized duplicate of @path. The caller is responsible for
|
||||||
|
* cleaning up the original.
|
||||||
|
*/
|
||||||
|
#define IS_DELIM(c) ((c) == '/' || (c) == '\\')
|
||||||
|
static char *sanitize_path(char *path)
|
||||||
|
{
|
||||||
|
char *cursor1 = path, *cursor2 = path;
|
||||||
|
|
||||||
|
/* skip all prepended delimiters */
|
||||||
|
while (IS_DELIM(*cursor1))
|
||||||
|
cursor1++;
|
||||||
|
|
||||||
|
/* copy the first letter */
|
||||||
|
*cursor2 = *cursor1;
|
||||||
|
|
||||||
|
/* copy the remainder... */
|
||||||
|
while (*(cursor1++)) {
|
||||||
|
/* ... skipping all duplicated delimiters */
|
||||||
|
if (IS_DELIM(*cursor1) && IS_DELIM(*cursor2))
|
||||||
|
continue;
|
||||||
|
*(++cursor2) = *cursor1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* if the last character is a delimiter, skip it */
|
||||||
|
if (IS_DELIM(*(cursor2 - 1)))
|
||||||
|
cursor2--;
|
||||||
|
|
||||||
|
*(cursor2) = '\0';
|
||||||
|
return kstrdup(path, GFP_KERNEL);
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Parse a devname into substrings and populate the ctx->UNC and ctx->prepath
|
* Parse a devname into substrings and populate the ctx->UNC and ctx->prepath
|
||||||
* fields with the result. Returns 0 on success and an error otherwise
|
* fields with the result. Returns 0 on success and an error otherwise
|
||||||
|
@ -493,7 +529,7 @@ smb3_parse_devname(const char *devname, struct smb3_fs_context *ctx)
|
||||||
if (!*pos)
|
if (!*pos)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
ctx->prepath = kstrdup(pos, GFP_KERNEL);
|
ctx->prepath = sanitize_path(pos);
|
||||||
if (!ctx->prepath)
|
if (!ctx->prepath)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
|
|
|
@ -1356,11 +1356,6 @@ struct inode *cifs_root_iget(struct super_block *sb)
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_CIFS_FSCACHE
|
|
||||||
/* populate tcon->resource_id */
|
|
||||||
tcon->resource_id = CIFS_I(inode)->uniqueid;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (rc && tcon->pipe) {
|
if (rc && tcon->pipe) {
|
||||||
cifs_dbg(FYI, "ipc connection - fake read inode\n");
|
cifs_dbg(FYI, "ipc connection - fake read inode\n");
|
||||||
spin_lock(&inode->i_lock);
|
spin_lock(&inode->i_lock);
|
||||||
|
@ -1375,14 +1370,6 @@ struct inode *cifs_root_iget(struct super_block *sb)
|
||||||
iget_failed(inode);
|
iget_failed(inode);
|
||||||
inode = ERR_PTR(rc);
|
inode = ERR_PTR(rc);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* The cookie is initialized from volume info returned above.
|
|
||||||
* Inside cifs_fscache_get_super_cookie it checks
|
|
||||||
* that we do not get super cookie twice.
|
|
||||||
*/
|
|
||||||
cifs_fscache_get_super_cookie(tcon);
|
|
||||||
|
|
||||||
out:
|
out:
|
||||||
kfree(path);
|
kfree(path);
|
||||||
free_xid(xid);
|
free_xid(xid);
|
||||||
|
|
Loading…
Reference in a new issue