Commit 6642d600 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag '5.11-rc5-smb3' of git://git.samba.org/sfrench/cifs-2.6 

Pull cifs fixes from Steve French:
 "Four cifs patches found in additional testing of the conversion to the
  new mount API: three small option processing ones, and one fixing domain
  based DFS referrals"

* tag '5.11-rc5-smb3' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: fix dfs domain referrals
  cifs: returning mount parm processing errors correctly
  cifs: fix mounts to subdirectories of target
  cifs: ignore auto and noauto options if given
parents ad8b3c1e 0d4873f9

fs/cifs/cifs_dfs_ref.c

+8 −4
Original line number Diff line number Diff line
@@ -134,7 +134,8 @@ cifs_build_devname(char *nodename, const char *prepath) 
 */

char *cifs_compose_mount_options(const char *sb_mountdata,

				 const char *fullpath,

				   const struct dfs_info3_param *ref)

				 const struct dfs_info3_param *ref,

				 char **devname)

{

	int rc;

	char *name;
@@ -231,6 +232,9 @@ char *cifs_compose_mount_options(const char *sb_mountdata, 
	strcat(mountdata, "ip=");

	strcat(mountdata, srvIP);



	if (devname)

		*devname = name;

	else

		kfree(name);



	/*cifs_dbg(FYI, "%s: parent mountdata: %s\n", __func__, sb_mountdata);*/
@@ -278,7 +282,7 @@ static struct vfsmount *cifs_dfs_do_mount(struct dentry *mntpt, 


	/* strip first '\' from fullpath */

	mountdata = cifs_compose_mount_options(cifs_sb->ctx->mount_options,

					       fullpath + 1, NULL);

					       fullpath + 1, NULL, NULL);

	if (IS_ERR(mountdata)) {

		kfree(devname);

		return (struct vfsmount *)mountdata;

fs/cifs/cifsfs.c

+1 −1
Original line number Diff line number Diff line
@@ -822,7 +822,7 @@ cifs_smb3_do_mount(struct file_system_type *fs_type, 
		goto out;

	}



	rc = cifs_setup_volume_info(cifs_sb->ctx);

	rc = cifs_setup_volume_info(cifs_sb->ctx, NULL, old_ctx->UNC);

	if (rc) {

		root = ERR_PTR(rc);

		goto out;

fs/cifs/cifsproto.h

+4 −2
Original line number Diff line number Diff line
@@ -78,7 +78,8 @@ extern char *cifs_build_path_to_root(struct smb3_fs_context *ctx, 
				     int add_treename);

extern char *build_wildcard_path_from_dentry(struct dentry *direntry);

extern char *cifs_compose_mount_options(const char *sb_mountdata,

		const char *fullpath, const struct dfs_info3_param *ref);

		const char *fullpath, const struct dfs_info3_param *ref,

		char **devname);

/* extern void renew_parental_timestamps(struct dentry *direntry);*/

extern struct mid_q_entry *AllocMidQEntry(const struct smb_hdr *smb_buffer,

					struct TCP_Server_Info *server);
@@ -89,6 +90,7 @@ extern void cifs_wake_up_task(struct mid_q_entry *mid); 
extern int cifs_handle_standard(struct TCP_Server_Info *server,

				struct mid_q_entry *mid);

extern int smb3_parse_devname(const char *devname, struct smb3_fs_context *ctx);

extern int smb3_parse_opt(const char *options, const char *key, char **val);

extern bool cifs_match_ipaddr(struct sockaddr *srcaddr, struct sockaddr *rhs);

extern int cifs_discard_remaining_data(struct TCP_Server_Info *server);

extern int cifs_call_async(struct TCP_Server_Info *server,
@@ -549,7 +551,7 @@ extern int SMBencrypt(unsigned char *passwd, const unsigned char *c8, 
			unsigned char *p24);



extern int

cifs_setup_volume_info(struct smb3_fs_context *ctx);

cifs_setup_volume_info(struct smb3_fs_context *ctx, const char *mntopts, const char *devname);



extern struct TCP_Server_Info *

cifs_find_tcp_session(struct smb3_fs_context *ctx);

fs/cifs/connect.c

+26 −6
Original line number Diff line number Diff line
@@ -2972,17 +2972,20 @@ expand_dfs_referral(const unsigned int xid, struct cifs_ses *ses, 
	rc = dfs_cache_find(xid, ses, cifs_sb->local_nls, cifs_remap(cifs_sb),

			    ref_path, &referral, NULL);

	if (!rc) {

		char *fake_devname = NULL;



		mdata = cifs_compose_mount_options(cifs_sb->ctx->mount_options,

						   full_path + 1, &referral);

						   full_path + 1, &referral,

						   &fake_devname);

		free_dfs_info_param(&referral);



		if (IS_ERR(mdata)) {

			rc = PTR_ERR(mdata);

			mdata = NULL;

		} else {

			smb3_cleanup_fs_context_contents(ctx);

			rc = cifs_setup_volume_info(ctx);

			rc = cifs_setup_volume_info(ctx, mdata, fake_devname);

		}

		kfree(fake_devname);

		kfree(cifs_sb->ctx->mount_options);

		cifs_sb->ctx->mount_options = mdata;

	}
@@ -3036,6 +3039,7 @@ static int setup_dfs_tgt_conn(const char *path, const char *full_path, 
	struct dfs_info3_param ref = {0};

	char *mdata = NULL;

	struct smb3_fs_context fake_ctx = {NULL};

	char *fake_devname = NULL;



	cifs_dbg(FYI, "%s: dfs path: %s\n", __func__, path);
@@ -3044,16 +3048,18 @@ static int setup_dfs_tgt_conn(const char *path, const char *full_path, 
		return rc;



	mdata = cifs_compose_mount_options(cifs_sb->ctx->mount_options,

					   full_path + 1, &ref);

					   full_path + 1, &ref,

					   &fake_devname);

	free_dfs_info_param(&ref);



	if (IS_ERR(mdata)) {

		rc = PTR_ERR(mdata);

		mdata = NULL;

	} else

		rc = cifs_setup_volume_info(&fake_ctx);

		rc = cifs_setup_volume_info(&fake_ctx, mdata, fake_devname);



	kfree(mdata);

	kfree(fake_devname);



	if (!rc) {

		/*
@@ -3122,10 +3128,24 @@ static int do_dfs_failover(const char *path, const char *full_path, struct cifs_ 
 * we should pass a clone of the original context?

 */

int

cifs_setup_volume_info(struct smb3_fs_context *ctx)

cifs_setup_volume_info(struct smb3_fs_context *ctx, const char *mntopts, const char *devname)

{

	int rc = 0;



	smb3_parse_devname(devname, ctx);



	if (mntopts) {

		char *ip;



		cifs_dbg(FYI, "%s: mntopts=%s\n", __func__, mntopts);

		rc = smb3_parse_opt(mntopts, "ip", &ip);

		if (!rc && !cifs_convert_address((struct sockaddr *)&ctx->dstaddr, ip,

						 strlen(ip))) {

			cifs_dbg(VFS, "%s: failed to convert ip address\n", __func__);

			return -EINVAL;

		}

	}



	if (ctx->nullauth) {

		cifs_dbg(FYI, "Anonymous login\n");

		kfree(ctx->username);

fs/cifs/dfs_cache.c

+5 −3
Original line number Diff line number Diff line
@@ -1417,7 +1417,7 @@ static struct cifs_ses *find_root_ses(struct vol_info *vi, 
	int rc;

	struct cache_entry *ce;

	struct dfs_info3_param ref = {0};

	char *mdata = NULL;

	char *mdata = NULL, *devname = NULL;

	struct TCP_Server_Info *server;

	struct cifs_ses *ses;

	struct smb3_fs_context ctx = {NULL};
@@ -1444,7 +1444,8 @@ static struct cifs_ses *find_root_ses(struct vol_info *vi, 


	up_read(&htable_rw_lock);



	mdata = cifs_compose_mount_options(vi->mntdata, rpath, &ref);

	mdata = cifs_compose_mount_options(vi->mntdata, rpath, &ref,

					   &devname);

	free_dfs_info_param(&ref);



	if (IS_ERR(mdata)) {
@@ -1453,7 +1454,7 @@ static struct cifs_ses *find_root_ses(struct vol_info *vi, 
		goto out;

	}



	rc = cifs_setup_volume_info(&ctx);

	rc = cifs_setup_volume_info(&ctx, NULL, devname);



	if (rc) {

		ses = ERR_PTR(rc);
@@ -1472,6 +1473,7 @@ static struct cifs_ses *find_root_ses(struct vol_info *vi, 
	smb3_cleanup_fs_context_contents(&ctx);

	kfree(mdata);

	kfree(rpath);

	kfree(devname);



	return ses;

}