Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d3f489e authored by Paul Aurich's avatar Paul Aurich Committed by Greg Kroah-Hartman
Browse files

SMB3: Honor 'posix' flag for multiuser mounts 



[ Upstream commit 5391b8e1b7b7e5cfa2dd4ffdc4b8c6b64dfd1866 ]

The flag from the primary tcon needs to be copied into the volume info
so that cifs_get_tcon will try to enable extensions on the per-user
tcon. At that point, since posix extensions must have already been
enabled on the superblock, don't try to needlessly adjust the mount
flags.

Fixes: ce558b0e ("smb3: Add posix create context for smb3.11 posix mounts")
Fixes: b326614e ("smb3: allow "posix" mount option to enable new SMB311 protocol extensions")
Signed-off-by: default avatarPaul Aurich <paul@darkrain42.org>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
Reviewed-by: default avatarAurelien Aptel <aaptel@suse.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 8964c934

fs/cifs/connect.c

+1 −4
Original line number Diff line number Diff line
@@ -5282,6 +5282,7 @@ cifs_construct_tcon(struct cifs_sb_info *cifs_sb, kuid_t fsuid) 
	vol_info->nohandlecache = master_tcon->nohandlecache;

	vol_info->local_lease = master_tcon->local_lease;

	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->sign = master_tcon->ses->sign;
@@ -5309,10 +5310,6 @@ cifs_construct_tcon(struct cifs_sb_info *cifs_sb, kuid_t fsuid) 
		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))

		reset_cifs_unix_caps(0, tcon, NULL, vol_info);