Commit b8e516b3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull cifs fixes from Steve French:
 "Eight cifs/smb3 fixes, most when specifying the multiuser mount flag.

  Five of the fixes are for stable"

* tag '5.8-rc3-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: prevent truncation from long to int in wait_for_free_credits
  cifs: Fix the target file was deleted when rename failed.
  SMB3: Honor 'posix' flag for multiuser mounts
  SMB3: Honor 'handletimeout' flag for multiuser mounts
  SMB3: Honor lease disabling for multiuser mounts
  SMB3: Honor persistent/resilient handle flags for multiuser mounts
  SMB3: Honor 'seal' flag for multiuser mounts
  cifs: Display local UID details for SMB sessions in DebugData
parents 6f216714 19e88867

fs/cifs/cifs_debug.c

+5 −1
Original line number Original line Diff line number Diff line
@@ -399,6 +399,10 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v) 
			if (ses->sign)

			if (ses->sign)

				seq_puts(m, " signed");

				seq_puts(m, " signed");





			seq_printf(m, "\n\tUser: %d Cred User: %d",

				   from_kuid(&init_user_ns, ses->linux_uid),

				   from_kuid(&init_user_ns, ses->cred_uid));



			if (ses->chan_count > 1) {

			if (ses->chan_count > 1) {

				seq_printf(m, "\n\n\tExtra Channels: %zu\n",

				seq_printf(m, "\n\n\tExtra Channels: %zu\n",

					   ses->chan_count-1);

					   ses->chan_count-1);
@@ -406,7 +410,7 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v) 
					cifs_dump_channel(m, j, &ses->chans[j]);

					cifs_dump_channel(m, j, &ses->chans[j]);

			}

			}





			seq_puts(m, "\n\tShares:");

			seq_puts(m, "\n\n\tShares:");

			j = 0;

			j = 0;





			seq_printf(m, "\n\t%d) IPC: ", j);

			seq_printf(m, "\n\t%d) IPC: ", j);

fs/cifs/connect.c

+6 −4
Original line number Original line Diff line number Diff line
@@ -5306,9 +5306,15 @@ cifs_construct_tcon(struct cifs_sb_info *cifs_sb, kuid_t fsuid) 
	vol_info->nocase = master_tcon->nocase;

	vol_info->nocase = master_tcon->nocase;

	vol_info->nohandlecache = master_tcon->nohandlecache;

	vol_info->nohandlecache = master_tcon->nohandlecache;

	vol_info->local_lease = master_tcon->local_lease;

	vol_info->local_lease = master_tcon->local_lease;

	vol_info->no_lease = master_tcon->no_lease;

	vol_info->resilient = master_tcon->use_resilient;

	vol_info->persistent = master_tcon->use_persistent;

	vol_info->handle_timeout = master_tcon->handle_timeout;

	vol_info->no_linux_ext = !master_tcon->unix_ext;

	vol_info->no_linux_ext = !master_tcon->unix_ext;

	vol_info->linux_ext = master_tcon->posix_extensions;

	vol_info->sectype = master_tcon->ses->sectype;

	vol_info->sectype = master_tcon->ses->sectype;

	vol_info->sign = master_tcon->ses->sign;

	vol_info->sign = master_tcon->ses->sign;

	vol_info->seal = master_tcon->seal;





	rc = cifs_set_vol_auth(vol_info, master_tcon->ses);

	rc = cifs_set_vol_auth(vol_info, master_tcon->ses);

	if (rc) {

	if (rc) {
@@ -5334,10 +5340,6 @@ cifs_construct_tcon(struct cifs_sb_info *cifs_sb, kuid_t fsuid) 
		goto out;

		goto out;

	}

	}





	/* if new SMB3.11 POSIX extensions are supported do not remap / and \ */

	if (tcon->posix_extensions)

		cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_POSIX_PATHS;



	if (cap_unix(ses))

	if (cap_unix(ses))

		reset_cifs_unix_caps(0, tcon, NULL, vol_info);

		reset_cifs_unix_caps(0, tcon, NULL, vol_info);

fs/cifs/inode.c

+8 −2
Original line number Original line Diff line number Diff line
@@ -2044,6 +2044,7 @@ cifs_rename2(struct inode *source_dir, struct dentry *source_dentry, 
	FILE_UNIX_BASIC_INFO *info_buf_target;

	FILE_UNIX_BASIC_INFO *info_buf_target;

	unsigned int xid;

	unsigned int xid;

	int rc, tmprc;

	int rc, tmprc;

	bool new_target = d_really_is_negative(target_dentry);





	if (flags & ~RENAME_NOREPLACE)

	if (flags & ~RENAME_NOREPLACE)

		return -EINVAL;

		return -EINVAL;
@@ -2120,8 +2121,13 @@ cifs_rename2(struct inode *source_dir, struct dentry *source_dentry, 
	 */

	 */





unlink_target:

unlink_target:

	/* Try unlinking the target dentry if it's not negative */

	/*

	if (d_really_is_positive(target_dentry) && (rc == -EACCES || rc == -EEXIST)) {

	 * If the target dentry was created during the rename, try

	 * unlinking it if it's not negative

	 */

	if (new_target &&

	    d_really_is_positive(target_dentry) &&

	    (rc == -EACCES || rc == -EEXIST)) {

		if (d_is_dir(target_dentry))

		if (d_is_dir(target_dentry))

			tmprc = cifs_rmdir(target_dir, target_dentry);

			tmprc = cifs_rmdir(target_dir, target_dentry);

		else

		else

fs/cifs/transport.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -523,7 +523,7 @@ wait_for_free_credits(struct TCP_Server_Info *server, const int num_credits, 
		      const int timeout, const int flags,

		      const int timeout, const int flags,

		      unsigned int *instance)

		      unsigned int *instance)

{

{

	int rc;

	long rc;

	int *credits;

	int *credits;

	int optype;

	int optype;

	long int t;

	long int t;