From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 12 Apr 2021 08:01:05 +0000 (+0200)
Subject: 4.9-stable patches
X-Git-Tag: v4.19.187~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1aed6e23027a736e4a3cf6f0b5e8d710d41515a7;p=thirdparty%2Fkernel%2Fstable-queue.git

4.9-stable patches

added patches:
	revert-cifs-set-cifs_mount_use_prefix_path-flag-on-setting-cifs_sb-prepath.patch
---

diff --git a/queue-4.9/revert-cifs-set-cifs_mount_use_prefix_path-flag-on-setting-cifs_sb-prepath.patch b/queue-4.9/revert-cifs-set-cifs_mount_use_prefix_path-flag-on-setting-cifs_sb-prepath.patch
new file mode 100644
index 00000000000..a245e589d68
--- /dev/null
+++ b/queue-4.9/revert-cifs-set-cifs_mount_use_prefix_path-flag-on-setting-cifs_sb-prepath.patch
@@ -0,0 +1,34 @@
+From a2acabd066e828dd815c0920f98ca657a014847d Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Mon, 12 Apr 2021 09:56:57 +0200
+Subject: Revert "cifs: Set CIFS_MOUNT_USE_PREFIX_PATH flag on setting cifs_sb->prepath."
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit 742300e32db00f008e944acafaeba9a12730eff0 which is
+commit a738c93fb1c17e386a09304b517b1c6b2a6a5a8b upstream.
+
+It is reported to cause problems in older kernels, so revert it for now
+until we can figure it out...
+
+Reported-by: Salvatore Bonaccorso <carnil@debian.org>
+Link: https://lore.kernel.org/r/YG7r0UaivWZL762N@eldamar.lan
+Cc: Shyam Prasad N <sprasad@microsoft.com>
+Cc: Aurelien Aptel <aaptel@suse.com>
+Cc: Steve French <stfrench@microsoft.com>
+Cc: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ fs/cifs/connect.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/fs/cifs/connect.c
++++ b/fs/cifs/connect.c
+@@ -3488,7 +3488,6 @@ int cifs_setup_cifs_sb(struct smb_vol *p
+ 		cifs_sb->prepath = kstrdup(pvolume_info->prepath, GFP_KERNEL);
+ 		if (cifs_sb->prepath == NULL)
+ 			return -ENOMEM;
+-		cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_USE_PREFIX_PATH;
+ 	}
+ 
+ 	return 0;
diff --git a/queue-4.9/series b/queue-4.9/series
index 096e5a37405..cb82633a46e 100644
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -39,3 +39,4 @@ net-ieee802154-fix-nl802154-del-llsec-devkey.patch
 net-ieee802154-forbid-monitor-for-set-llsec-params.patch
 net-ieee802154-forbid-monitor-for-del-llsec-seclevel.patch
 net-ieee802154-stop-dump-llsec-params-for-monitors.patch
+revert-cifs-set-cifs_mount_use_prefix_path-flag-on-setting-cifs_sb-prepath.patch