Commit d01132ae authored by Paulo Alcantara's avatar Paulo Alcantara Committed by Steve French
Browse files

cifs: fix nodfs mount option 



Skip DFS resolving when mounting with 'nodfs' even if
CONFIG_CIFS_DFS_UPCALL is enabled.

Signed-off-by: default avatarPaulo Alcantara (SUSE) <pc@cjr.nz>
Cc: stable@vger.kernel.org # 5.11
Reviewed-by: default avatarShyam Prasad N <sprasad@microsoft.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent d08395a3

fs/cifs/connect.c

+4 −4
Original line number Diff line number Diff line
@@ -3379,15 +3379,15 @@ int cifs_mount(struct cifs_sb_info *cifs_sb, struct smb3_fs_context *ctx) 


	rc = mount_get_conns(ctx, cifs_sb, &xid, &server, &ses, &tcon);

	/*

	 * Unconditionally try to get an DFS referral (even cached) to determine whether it is an

	 * DFS mount.

	 * If called with 'nodfs' mount option, then skip DFS resolving.  Otherwise unconditionally

	 * try to get an DFS referral (even cached) to determine whether it is an DFS mount.

	 *

	 * Skip prefix path to provide support for DFS referrals from w2k8 servers which don't seem

	 * to respond with PATH_NOT_COVERED to requests that include the prefix.

	 */

	if (dfs_cache_find(xid, ses, cifs_sb->local_nls, cifs_remap(cifs_sb), ctx->UNC + 1, NULL,

	if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_DFS) ||

	    dfs_cache_find(xid, ses, cifs_sb->local_nls, cifs_remap(cifs_sb), ctx->UNC + 1, NULL,

			   NULL)) {

		/* No DFS referral was returned.  Looks like a regular share. */

		if (rc)

			goto error;

		/* Check if it is fully accessible and then mount it */