4.19-stable patches

added patches:
	net-smc-no-peer-id-in-clc-decline-for-smcd.patch

diff --git a/queue-4.19/net-smc-no-peer-id-in-clc-decline-for-smcd.patch b/queue-4.19/net-smc-no-peer-id-in-clc-decline-for-smcd.patch
new file mode 100644 (file)
index 0000000..bc0f1aa
--- /dev/null
+++ b/queue-4.19/net-smc-no-peer-id-in-clc-decline-for-smcd.patch
@@ -0,0 +1,35 @@
+From 369537c97024dca99303a8d4d6ab38b4f54d3909 Mon Sep 17 00:00:00 2001
+From: Ursula Braun <ubraun@linux.ibm.com>
+Date: Fri, 14 Feb 2020 08:59:00 +0100
+Subject: net/smc: no peer ID in CLC decline for SMCD
+
+From: Ursula Braun <ubraun@linux.ibm.com>
+
+commit 369537c97024dca99303a8d4d6ab38b4f54d3909 upstream.
+
+Just SMCR requires a CLC Peer ID, but not SMCD. The field should be
+zero for SMCD.
+
+Fixes: c758dfddc1b5 ("net/smc: add SMC-D support in CLC messages")
+Signed-off-by: Ursula Braun <ubraun@linux.ibm.com>
+Signed-off-by: Karsten Graul <kgraul@linux.ibm.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ net/smc/smc_clc.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/net/smc/smc_clc.c
++++ b/net/smc/smc_clc.c
+@@ -364,7 +364,9 @@ int smc_clc_send_decline(struct smc_sock
+       dclc.hdr.length = htons(sizeof(struct smc_clc_msg_decline));
+       dclc.hdr.version = SMC_CLC_V1;
+       dclc.hdr.flag = (peer_diag_info == SMC_CLC_DECL_SYNCERR) ? 1 : 0;
+-      memcpy(dclc.id_for_peer, local_systemid, sizeof(local_systemid));
++      if (smc->conn.lgr && !smc->conn.lgr->is_smcd)
++              memcpy(dclc.id_for_peer, local_systemid,
++                     sizeof(local_systemid));
+       dclc.peer_diagnosis = htonl(peer_diag_info);
+       memcpy(dclc.trl.eyecatcher, SMC_EYECATCHER, sizeof(SMC_EYECATCHER));
+ 

diff --git a/queue-4.19/series b/queue-4.19/series
index 921c1fabf26a9c78d0bee2d6a8787ee6df60c7c7..761b090e61f2668d03c99c5f3b847d7005a14816 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -62,3 +62,4 @@ s390-qeth-vnicc-fix-eopnotsupp-precedence.patch
 net-netlink-cap-max-groups-which-will-be-considered-in-netlink_bind.patch
 net-atlantic-fix-use-after-free-kasan-warn.patch
 net-atlantic-fix-potential-error-handling.patch
+net-smc-no-peer-id-in-clc-decline-for-smcd.patch