Commit 9273d6cb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 3f667b5d a3108089

fs/cifs/connect.c

+7 −0
Original line number Diff line number Diff line
@@ -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);



	/*

	 * 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:

	mnt_ctx->server = server;

	mnt_ctx->ses = ses;

fs/cifs/fs_context.c

+37 −1
Original line number Diff line number Diff line
@@ -434,6 +434,42 @@ int smb3_parse_opt(const char *options, const char *key, char **val) 
	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

 * 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)

		return 0;



	ctx->prepath = kstrdup(pos, GFP_KERNEL);

	ctx->prepath = sanitize_path(pos);

	if (!ctx->prepath)

		return -ENOMEM;

fs/cifs/inode.c

+0 −13
Original line number Diff line number Diff line
@@ -1356,11 +1356,6 @@ struct inode *cifs_root_iget(struct super_block *sb) 
		goto out;

	}



#ifdef CONFIG_CIFS_FSCACHE

	/* populate tcon->resource_id */

	tcon->resource_id = CIFS_I(inode)->uniqueid;

#endif



	if (rc && tcon->pipe) {

		cifs_dbg(FYI, "ipc connection - fake read inode\n");

		spin_lock(&inode->i_lock);
@@ -1375,14 +1370,6 @@ struct inode *cifs_root_iget(struct super_block *sb) 
		iget_failed(inode);

		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:

	kfree(path);

	free_xid(xid);