Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Hocko <mhocko@suse.com>2018-10-26 15:43:23 +0200
committerMichal Hocko <mhocko@suse.com>2018-10-26 15:43:23 +0200
commitff2e99796c256bccd6f0e0367227ca8f02932ba8 (patch)
tree939bc7fe2d3ef64aab641aaf05dd333e80fd1730
parent17f167524f3ca1ef765f9dc9a643a56444f5b260 (diff)
parentc9196fa3f4a93d43857bad38e1392d0a24c8584f (diff)
Merge remote-tracking branch 'origin/users/aaptel/SLE12-SP4/for-next' into users/mhocko/SLE12-SP4/for-next
-rw-r--r--patches.fixes/cifs-connect-to-servername-instead-of-IP-for-IPC-share.patch46
-rw-r--r--series.conf1
2 files changed, 47 insertions, 0 deletions
diff --git a/patches.fixes/cifs-connect-to-servername-instead-of-IP-for-IPC-share.patch b/patches.fixes/cifs-connect-to-servername-instead-of-IP-for-IPC-share.patch
new file mode 100644
index 0000000000..6ae07e604b
--- /dev/null
+++ b/patches.fixes/cifs-connect-to-servername-instead-of-IP-for-IPC-share.patch
@@ -0,0 +1,46 @@
+From: Thomas Werschlein <thomas.werschlein@geo.uzh.ch>
+Date: Thu, 30 Aug 2018 18:29:20 +0200
+Subject: [PATCH] cifs: connect to servername instead of IP for IPC$ share
+Mime-version: 1.0
+Content-type: text/plain; charset=UTF-8
+Content-transfer-encoding: 8bit
+Git-commit: 395a2076b4064f97d3fce03af15210ff2a7bb7f9
+Patch-mainline: v4.19-rc3
+References: bsc#1106359
+
+This patch is required allows access to a Microsoft fileserver failover
+cluster behind a 1:1 NAT firewall.
+
+The change also provides stronger context for authentication and share
+connection (see MS-SMB2 3.3.5.7 and MS-SRVS 3.1.6.8) as noted by
+Tom Talpey, and addresses comments about the buffer size for the UNC
+made by Aurélien Aptel.
+
+Signed-off-by: Thomas Werschlein <thomas.werschlein@geo.uzh.ch>
+Signed-off-by: Steve French <stfrench@microsoft.com>
+Cc: Tom Talpey <ttalpey@microsoft.com>
+Reviewed-by: Aurelien Aptel <aaptel@suse.com>
+Cc: Stable <stable@vger.kernel.org>
+Acked-by: Aurelien Aptel <aaptel@suse.com>
+
+---
+ fs/cifs/connect.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
+index c832a8a1970a..7aa08dba4719 100644
+--- a/fs/cifs/connect.c
++++ b/fs/cifs/connect.c
+@@ -2547,7 +2547,7 @@ cifs_setup_ipc(struct cifs_ses *ses, struct smb_vol *volume_info)
+ if (tcon == NULL)
+ return -ENOMEM;
+
+- snprintf(unc, sizeof(unc), "\\\\%s\\IPC$", ses->serverName);
++ snprintf(unc, sizeof(unc), "\\\\%s\\IPC$", ses->server->hostname);
+
+ /* cannot fail */
+ nls_codepage = load_nls_default();
+--
+2.13.7
+
+
diff --git a/series.conf b/series.conf
index e3c0ab710a..cae809f419 100644
--- a/series.conf
+++ b/series.conf
@@ -17871,6 +17871,7 @@
patches.drivers/gpio-Fix-crash-due-to-registration-race.patch
patches.suse/btrfs-sync-log-after-logging-new-name.patch
patches.suse/btrfs-fix-data-corruption-when-deduplicating-between.patch
+ patches.fixes/cifs-connect-to-servername-instead-of-IP-for-IPC-share.patch
patches.drivers/ALSA-hda-Fix-cancel_work_sync-stall-from-jackpoll-wo.patch
patches.arch/acpi-bus-only-call-dmi_check_system-on-x86.patch
patches.suse/0001-md-cluster-release-RESYNC-lock-after-the-last-resync.patch