5.4-stable patches

added patches:
	sctp-fix-shutdown-ctsn-ack-in-the-peer-restart-case.patch

diff --git a/queue-5.4/sctp-fix-shutdown-ctsn-ack-in-the-peer-restart-case.patch b/queue-5.4/sctp-fix-shutdown-ctsn-ack-in-the-peer-restart-case.patch
new file mode 100644 (file)
index 0000000..857d1d6
--- /dev/null
+++ b/queue-5.4/sctp-fix-shutdown-ctsn-ack-in-the-peer-restart-case.patch
@@ -0,0 +1,45 @@
+From 12dfd78e3a74825e6f0bc8df7ef9f938fbc6bfe3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jere=20Lepp=C3=A4nen?= <jere.leppanen@nokia.com>
+Date: Tue, 21 Apr 2020 22:03:42 +0300
+Subject: sctp: Fix SHUTDOWN CTSN Ack in the peer restart case
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Jere Leppänen <jere.leppanen@nokia.com>
+
+commit 12dfd78e3a74825e6f0bc8df7ef9f938fbc6bfe3 upstream.
+
+When starting shutdown in sctp_sf_do_dupcook_a(), get the value for
+SHUTDOWN Cumulative TSN Ack from the new association, which is
+reconstructed from the cookie, instead of the old association, which
+the peer doesn't have anymore.
+
+Otherwise the SHUTDOWN is either ignored or replied to with an ABORT
+by the peer because CTSN Ack doesn't match the peer's Initial TSN.
+
+Fixes: bdf6fa52f01b ("sctp: handle association restarts when the socket is closed.")
+Signed-off-by: Jere Leppänen <jere.leppanen@nokia.com>
+Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ net/sctp/sm_make_chunk.c |    6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+--- a/net/sctp/sm_make_chunk.c
++++ b/net/sctp/sm_make_chunk.c
+@@ -858,7 +858,11 @@ struct sctp_chunk *sctp_make_shutdown(co
+       struct sctp_chunk *retval;
+       __u32 ctsn;
+ 
+-      ctsn = sctp_tsnmap_get_ctsn(&asoc->peer.tsn_map);
++      if (chunk && chunk->asoc)
++              ctsn = sctp_tsnmap_get_ctsn(&chunk->asoc->peer.tsn_map);
++      else
++              ctsn = sctp_tsnmap_get_ctsn(&asoc->peer.tsn_map);
++
+       shut.cum_tsn_ack = htonl(ctsn);
+ 
+       retval = sctp_make_control(asoc, SCTP_CID_SHUTDOWN, 0,

diff --git a/queue-5.4/series b/queue-5.4/series
index ee22ab6027d869d13282c30b300324ec9f7d5eea..cbd0ea3103c9f528f8510219e7831382795152fb 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -28,3 +28,4 @@ mac80211-sta_info-add-lockdep-condition-for-rcu-list.patch
 net-bcmgenet-suppress-warnings-on-failed-rx-skb-allo.patch
 net-systemport-suppress-warnings-on-failed-rx-skb-al.patch
 drm-i915-extend-wadisabledarbfclkgating-to-icl-ehl-tgl.patch
+sctp-fix-shutdown-ctsn-ack-in-the-peer-restart-case.patch