[PATCH net 0/2] sctp: Fix problems with peer restart when in SHUTDOWN-PENDING state and socket is closed

[PATCH net 0/2] sctp: Fix problems with peer restart when in SHUTDOWN-PENDING state and socket is closed

[Jere Leppänen]

These patches are related to the scenario described in commit
bdf6fa52f01b ("sctp: handle association restarts when the socket is
closed."). To recap, when our association is in SHUTDOWN-PENDING state
and we've closed our one-to-one socket, while the peer crashes without
being detected, restarts and reconnects using the same addresses and
ports, we start association shutdown.

In this case, Cumulative TSN Ack in the SHUTDOWN that we send has
always been incorrect. Additionally, bundling of the SHUTDOWN with the
COOKIE-ACK was broken by a later commit. This series fixes both of
these issues.

Jere Leppänen (2):
  sctp: Fix bundling of SHUTDOWN with COOKIE-ACK
  sctp: Fix SHUTDOWN CTSN Ack in the peer restart case

 net/sctp/sm_make_chunk.c | 6 +++++-
 net/sctp/sm_statefuns.c  | 6 +++---
 2 files changed, 8 insertions(+), 4 deletions(-)


base-commit: a460fc5d4c170806a31e590df37ead3ab951315c
-- 
2.25.2

[PATCH net 0/2] sctp: Fix problems with peer restart when in SHUTDOWN-PENDING state and socket is cl

[Jere Leppänen]

VGhlc2UgcGF0Y2hlcyBhcmUgcmVsYXRlZCB0byB0aGUgc2NlbmFyaW8gZGVzY3JpYmVkIGluIGNv
bW1pdApiZGY2ZmE1MmYwMWIgKCJzY3RwOiBoYW5kbGUgYXNzb2NpYXRpb24gcmVzdGFydHMgd2hl
biB0aGUgc29ja2V0IGlzCmNsb3NlZC4iKS4gVG8gcmVjYXAsIHdoZW4gb3VyIGFzc29jaWF0aW9u
IGlzIGluIFNIVVRET1dOLVBFTkRJTkcgc3RhdGUKYW5kIHdlJ3ZlIGNsb3NlZCBvdXIgb25lLXRv
LW9uZSBzb2NrZXQsIHdoaWxlIHRoZSBwZWVyIGNyYXNoZXMgd2l0aG91dApiZWluZyBkZXRlY3Rl
ZCwgcmVzdGFydHMgYW5kIHJlY29ubmVjdHMgdXNpbmcgdGhlIHNhbWUgYWRkcmVzc2VzIGFuZApw
b3J0cywgd2Ugc3RhcnQgYXNzb2NpYXRpb24gc2h1dGRvd24uCgpJbiB0aGlzIGNhc2UsIEN1bXVs
YXRpdmUgVFNOIEFjayBpbiB0aGUgU0hVVERPV04gdGhhdCB3ZSBzZW5kIGhhcwphbHdheXMgYmVl
biBpbmNvcnJlY3QuIEFkZGl0aW9uYWxseSwgYnVuZGxpbmcgb2YgdGhlIFNIVVRET1dOIHdpdGgg
dGhlCkNPT0tJRS1BQ0sgd2FzIGJyb2tlbiBieSBhIGxhdGVyIGNvbW1pdC4gVGhpcyBzZXJpZXMg
Zml4ZXMgYm90aCBvZgp0aGVzZSBpc3N1ZXMuCgpKZXJlIExlcHDDpG5lbiAoMik6CiAgc2N0cDog
Rml4IGJ1bmRsaW5nIG9mIFNIVVRET1dOIHdpdGggQ09PS0lFLUFDSwogIHNjdHA6IEZpeCBTSFVU
RE9XTiBDVFNOIEFjayBpbiB0aGUgcGVlciByZXN0YXJ0IGNhc2UKCiBuZXQvc2N0cC9zbV9tYWtl
X2NodW5rLmMgfCA2ICsrKysrLQogbmV0L3NjdHAvc21fc3RhdGVmdW5zLmMgIHwgNiArKystLS0K
IDIgZmlsZXMgY2hhbmdlZCwgOCBpbnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygtKQoKCmJhc2Ut
Y29tbWl0OiBhNDYwZmM1ZDRjMTcwODA2YTMxZTU5MGRmMzdlYWQzYWI5NTEzMTVjCi0tIAoyLjI1
LjIKCg=

[PATCH net 1/2] sctp: Fix bundling of SHUTDOWN with COOKIE-ACK

[Jere Leppänen]

When we start shutdown in sctp_sf_do_dupcook_a(), we want to bundle
the SHUTDOWN with the COOKIE-ACK to ensure that the peer receives them
at the same time and in the correct order. This bundling was broken by
commit 4ff40b86262b ("sctp: set chunk transport correctly when it's a
new asoc"), which assigns a transport for the COOKIE-ACK, but not for
the SHUTDOWN.

Fix this by passing a reference to the COOKIE-ACK chunk as an argument
to sctp_sf_do_9_2_start_shutdown() and onward to
sctp_make_shutdown(). This way the SHUTDOWN chunk is assigned the same
transport as the COOKIE-ACK chunk, which allows them to be bundled.

In sctp_sf_do_9_2_start_shutdown(), the void *arg parameter was
previously unused. Now that we're taking it into use, it must be a
valid pointer to a chunk, or NULL. There is only one call site where
it's not, in sctp_sf_autoclose_timer_expire(). Fix that too.

Fixes: 4ff40b86262b ("sctp: set chunk transport correctly when it's a new asoc")
Signed-off-by: Jere Leppänen <jere.leppanen@nokia.com>
---
 net/sctp/sm_statefuns.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index 6a16af4b1ef6..26788f4a3b9e 100644
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -1865,7 +1865,7 @@ static enum sctp_disposition sctp_sf_do_dupcook_a(
 		 */
 		sctp_add_cmd_sf(commands, SCTP_CMD_REPLY, SCTP_CHUNK(repl));
 		return sctp_sf_do_9_2_start_shutdown(net, ep, asoc,
-						     SCTP_ST_CHUNK(0), NULL,
+						     SCTP_ST_CHUNK(0), repl,
 						     commands);
 	} else {
 		sctp_add_cmd_sf(commands, SCTP_CMD_NEW_STATE,
@@ -5470,7 +5470,7 @@ enum sctp_disposition sctp_sf_do_9_2_start_shutdown(
 	 * in the Cumulative TSN Ack field the last sequential TSN it
 	 * has received from the peer.
 	 */
-	reply = sctp_make_shutdown(asoc, NULL);
+	reply = sctp_make_shutdown(asoc, arg);
 	if (!reply)
 		goto nomem;
 
@@ -6068,7 +6068,7 @@ enum sctp_disposition sctp_sf_autoclose_timer_expire(
 	disposition = SCTP_DISPOSITION_CONSUME;
 	if (sctp_outq_is_empty(&asoc->outqueue)) {
 		disposition = sctp_sf_do_9_2_start_shutdown(net, ep, asoc, type,
-							    arg, commands);
+							    NULL, commands);
 	}
 
 	return disposition;
-- 
2.25.2

[PATCH net 1/2] sctp: Fix bundling of SHUTDOWN with COOKIE-ACK

[Jere Leppänen]

V2hlbiB3ZSBzdGFydCBzaHV0ZG93biBpbiBzY3RwX3NmX2RvX2R1cGNvb2tfYSgpLCB3ZSB3YW50
IHRvIGJ1bmRsZQp0aGUgU0hVVERPV04gd2l0aCB0aGUgQ09PS0lFLUFDSyB0byBlbnN1cmUgdGhh
dCB0aGUgcGVlciByZWNlaXZlcyB0aGVtCmF0IHRoZSBzYW1lIHRpbWUgYW5kIGluIHRoZSBjb3Jy
ZWN0IG9yZGVyLiBUaGlzIGJ1bmRsaW5nIHdhcyBicm9rZW4gYnkKY29tbWl0IDRmZjQwYjg2MjYy
YiAoInNjdHA6IHNldCBjaHVuayB0cmFuc3BvcnQgY29ycmVjdGx5IHdoZW4gaXQncyBhCm5ldyBh
c29jIiksIHdoaWNoIGFzc2lnbnMgYSB0cmFuc3BvcnQgZm9yIHRoZSBDT09LSUUtQUNLLCBidXQg
bm90IGZvcgp0aGUgU0hVVERPV04uCgpGaXggdGhpcyBieSBwYXNzaW5nIGEgcmVmZXJlbmNlIHRv
IHRoZSBDT09LSUUtQUNLIGNodW5rIGFzIGFuIGFyZ3VtZW50CnRvIHNjdHBfc2ZfZG9fOV8yX3N0
YXJ0X3NodXRkb3duKCkgYW5kIG9ud2FyZCB0bwpzY3RwX21ha2Vfc2h1dGRvd24oKS4gVGhpcyB3
YXkgdGhlIFNIVVRET1dOIGNodW5rIGlzIGFzc2lnbmVkIHRoZSBzYW1lCnRyYW5zcG9ydCBhcyB0
aGUgQ09PS0lFLUFDSyBjaHVuaywgd2hpY2ggYWxsb3dzIHRoZW0gdG8gYmUgYnVuZGxlZC4KCklu
IHNjdHBfc2ZfZG9fOV8yX3N0YXJ0X3NodXRkb3duKCksIHRoZSB2b2lkICphcmcgcGFyYW1ldGVy
IHdhcwpwcmV2aW91c2x5IHVudXNlZC4gTm93IHRoYXQgd2UncmUgdGFraW5nIGl0IGludG8gdXNl
LCBpdCBtdXN0IGJlIGEKdmFsaWQgcG9pbnRlciB0byBhIGNodW5rLCBvciBOVUxMLiBUaGVyZSBp
cyBvbmx5IG9uZSBjYWxsIHNpdGUgd2hlcmUKaXQncyBub3QsIGluIHNjdHBfc2ZfYXV0b2Nsb3Nl
X3RpbWVyX2V4cGlyZSgpLiBGaXggdGhhdCB0b28uCgpGaXhlczogNGZmNDBiODYyNjJiICgic2N0
cDogc2V0IGNodW5rIHRyYW5zcG9ydCBjb3JyZWN0bHkgd2hlbiBpdCdzIGEgbmV3IGFzb2MiKQpT
aWduZWQtb2ZmLWJ5OiBKZXJlIExlcHDDpG5lbiA8amVyZS5sZXBwYW5lbkBub2tpYS5jb20+Ci0t
LQogbmV0L3NjdHAvc21fc3RhdGVmdW5zLmMgfCA2ICsrKy0tLQogMSBmaWxlIGNoYW5nZWQsIDMg
aW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9uZXQvc2N0cC9zbV9z
dGF0ZWZ1bnMuYyBiL25ldC9zY3RwL3NtX3N0YXRlZnVucy5jCmluZGV4IDZhMTZhZjRiMWVmNi4u
MjY3ODhmNGEzYjllIDEwMDY0NAotLS0gYS9uZXQvc2N0cC9zbV9zdGF0ZWZ1bnMuYworKysgYi9u
ZXQvc2N0cC9zbV9zdGF0ZWZ1bnMuYwpAQCAtMTg2NSw3ICsxODY1LDcgQEAgc3RhdGljIGVudW0g
c2N0cF9kaXNwb3NpdGlvbiBzY3RwX3NmX2RvX2R1cGNvb2tfYSgKIAkJICovCiAJCXNjdHBfYWRk
X2NtZF9zZihjb21tYW5kcywgU0NUUF9DTURfUkVQTFksIFNDVFBfQ0hVTksocmVwbCkpOwogCQly
ZXR1cm4gc2N0cF9zZl9kb185XzJfc3RhcnRfc2h1dGRvd24obmV0LCBlcCwgYXNvYywKLQkJCQkJ
CSAgICAgU0NUUF9TVF9DSFVOSygwKSwgTlVMTCwKKwkJCQkJCSAgICAgU0NUUF9TVF9DSFVOSygw
KSwgcmVwbCwKIAkJCQkJCSAgICAgY29tbWFuZHMpOwogCX0gZWxzZSB7CiAJCXNjdHBfYWRkX2Nt
ZF9zZihjb21tYW5kcywgU0NUUF9DTURfTkVXX1NUQVRFLApAQCAtNTQ3MCw3ICs1NDcwLDcgQEAg
ZW51bSBzY3RwX2Rpc3Bvc2l0aW9uIHNjdHBfc2ZfZG9fOV8yX3N0YXJ0X3NodXRkb3duKAogCSAq
IGluIHRoZSBDdW11bGF0aXZlIFRTTiBBY2sgZmllbGQgdGhlIGxhc3Qgc2VxdWVudGlhbCBUU04g
aXQKIAkgKiBoYXMgcmVjZWl2ZWQgZnJvbSB0aGUgcGVlci4KIAkgKi8KLQlyZXBseSA9IHNjdHBf
bWFrZV9zaHV0ZG93bihhc29jLCBOVUxMKTsKKwlyZXBseSA9IHNjdHBfbWFrZV9zaHV0ZG93bihh
c29jLCBhcmcpOwogCWlmICghcmVwbHkpCiAJCWdvdG8gbm9tZW07CiAKQEAgLTYwNjgsNyArNjA2
OCw3IEBAIGVudW0gc2N0cF9kaXNwb3NpdGlvbiBzY3RwX3NmX2F1dG9jbG9zZV90aW1lcl9leHBp
cmUoCiAJZGlzcG9zaXRpb24gPSBTQ1RQX0RJU1BPU0lUSU9OX0NPTlNVTUU7CiAJaWYgKHNjdHBf
b3V0cV9pc19lbXB0eSgmYXNvYy0+b3V0cXVldWUpKSB7CiAJCWRpc3Bvc2l0aW9uID0gc2N0cF9z
Zl9kb185XzJfc3RhcnRfc2h1dGRvd24obmV0LCBlcCwgYXNvYywgdHlwZSwKLQkJCQkJCQkgICAg
YXJnLCBjb21tYW5kcyk7CisJCQkJCQkJICAgIE5VTEwsIGNvbW1hbmRzKTsKIAl9CiAKIAlyZXR1
cm4gZGlzcG9zaXRpb247Ci0tIAoyLjI1LjIKCg=

[PATCH net 2/2] sctp: Fix SHUTDOWN CTSN Ack in the peer restart case

[Jere Leppänen]

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>
---
 net/sctp/sm_make_chunk.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
index 09050c1d5517..f7cb0b7faec2 100644
--- a/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
@@ -858,7 +858,11 @@ struct sctp_chunk *sctp_make_shutdown(const struct sctp_association *asoc,
 	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,
-- 
2.25.2

[PATCH net 2/2] sctp: Fix SHUTDOWN CTSN Ack in the peer restart case

[Jere Leppänen]

V2hlbiBzdGFydGluZyBzaHV0ZG93biBpbiBzY3RwX3NmX2RvX2R1cGNvb2tfYSgpLCBnZXQgdGhl
IHZhbHVlIGZvcgpTSFVURE9XTiBDdW11bGF0aXZlIFRTTiBBY2sgZnJvbSB0aGUgbmV3IGFzc29j
aWF0aW9uLCB3aGljaCBpcwpyZWNvbnN0cnVjdGVkIGZyb20gdGhlIGNvb2tpZSwgaW5zdGVhZCBv
ZiB0aGUgb2xkIGFzc29jaWF0aW9uLCB3aGljaAp0aGUgcGVlciBkb2Vzbid0IGhhdmUgYW55bW9y
ZS4KCk90aGVyd2lzZSB0aGUgU0hVVERPV04gaXMgZWl0aGVyIGlnbm9yZWQgb3IgcmVwbGllZCB0
byB3aXRoIGFuIEFCT1JUCmJ5IHRoZSBwZWVyIGJlY2F1c2UgQ1RTTiBBY2sgZG9lc24ndCBtYXRj
aCB0aGUgcGVlcidzIEluaXRpYWwgVFNOLgoKRml4ZXM6IGJkZjZmYTUyZjAxYiAoInNjdHA6IGhh
bmRsZSBhc3NvY2lhdGlvbiByZXN0YXJ0cyB3aGVuIHRoZSBzb2NrZXQgaXMgY2xvc2VkLiIpClNp
Z25lZC1vZmYtYnk6IEplcmUgTGVwcMOkbmVuIDxqZXJlLmxlcHBhbmVuQG5va2lhLmNvbT4KLS0t
CiBuZXQvc2N0cC9zbV9tYWtlX2NodW5rLmMgfCA2ICsrKysrLQogMSBmaWxlIGNoYW5nZWQsIDUg
aW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigtKQoKZGlmZiAtLWdpdCBhL25ldC9zY3RwL3NtX21h
a2VfY2h1bmsuYyBiL25ldC9zY3RwL3NtX21ha2VfY2h1bmsuYwppbmRleCAwOTA1MGMxZDU1MTcu
LmY3Y2IwYjdmYWVjMiAxMDA2NDQKLS0tIGEvbmV0L3NjdHAvc21fbWFrZV9jaHVuay5jCisrKyBi
L25ldC9zY3RwL3NtX21ha2VfY2h1bmsuYwpAQCAtODU4LDcgKzg1OCwxMSBAQCBzdHJ1Y3Qgc2N0
cF9jaHVuayAqc2N0cF9tYWtlX3NodXRkb3duKGNvbnN0IHN0cnVjdCBzY3RwX2Fzc29jaWF0aW9u
ICphc29jLAogCXN0cnVjdCBzY3RwX2NodW5rICpyZXR2YWw7CiAJX191MzIgY3RzbjsKIAotCWN0
c24gPSBzY3RwX3Rzbm1hcF9nZXRfY3RzbigmYXNvYy0+cGVlci50c25fbWFwKTsKKwlpZiAoY2h1
bmsgJiYgY2h1bmstPmFzb2MpCisJCWN0c24gPSBzY3RwX3Rzbm1hcF9nZXRfY3RzbigmY2h1bmst
PmFzb2MtPnBlZXIudHNuX21hcCk7CisJZWxzZQorCQljdHNuID0gc2N0cF90c25tYXBfZ2V0X2N0
c24oJmFzb2MtPnBlZXIudHNuX21hcCk7CisKIAlzaHV0LmN1bV90c25fYWNrID0gaHRvbmwoY3Rz
bik7CiAKIAlyZXR2YWwgPSBzY3RwX21ha2VfY29udHJvbChhc29jLCBTQ1RQX0NJRF9TSFVURE9X
TiwgMCwKLS0gCjIuMjUuMgoK

Re: [PATCH net 1/2] sctp: Fix bundling of SHUTDOWN with COOKIE-ACK

[Marcelo Ricardo Leitner]

On Tue, Apr 21, 2020 at 10:03:41PM +0300, Jere Leppänen wrote:
> When we start shutdown in sctp_sf_do_dupcook_a(), we want to bundle
> the SHUTDOWN with the COOKIE-ACK to ensure that the peer receives them
> at the same time and in the correct order. This bundling was broken by
> commit 4ff40b86262b ("sctp: set chunk transport correctly when it's a
> new asoc"), which assigns a transport for the COOKIE-ACK, but not for
> the SHUTDOWN.
> 
> Fix this by passing a reference to the COOKIE-ACK chunk as an argument
> to sctp_sf_do_9_2_start_shutdown() and onward to
> sctp_make_shutdown(). This way the SHUTDOWN chunk is assigned the same
> transport as the COOKIE-ACK chunk, which allows them to be bundled.
> 
> In sctp_sf_do_9_2_start_shutdown(), the void *arg parameter was
> previously unused. Now that we're taking it into use, it must be a
> valid pointer to a chunk, or NULL. There is only one call site where
> it's not, in sctp_sf_autoclose_timer_expire(). Fix that too.
> 
> Fixes: 4ff40b86262b ("sctp: set chunk transport correctly when it's a new asoc")
> Signed-off-by: Jere Leppänen <jere.leppanen@nokia.com>

Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>

Re: [PATCH net 1/2] sctp: Fix bundling of SHUTDOWN with COOKIE-ACK

[Marcelo Ricardo Leitner]

On Tue, Apr 21, 2020 at 10:03:41PM +0300, Jere Leppänen wrote:
> When we start shutdown in sctp_sf_do_dupcook_a(), we want to bundle
> the SHUTDOWN with the COOKIE-ACK to ensure that the peer receives them
> at the same time and in the correct order. This bundling was broken by
> commit 4ff40b86262b ("sctp: set chunk transport correctly when it's a
> new asoc"), which assigns a transport for the COOKIE-ACK, but not for
> the SHUTDOWN.
> 
> Fix this by passing a reference to the COOKIE-ACK chunk as an argument
> to sctp_sf_do_9_2_start_shutdown() and onward to
> sctp_make_shutdown(). This way the SHUTDOWN chunk is assigned the same
> transport as the COOKIE-ACK chunk, which allows them to be bundled.
> 
> In sctp_sf_do_9_2_start_shutdown(), the void *arg parameter was
> previously unused. Now that we're taking it into use, it must be a
> valid pointer to a chunk, or NULL. There is only one call site where
> it's not, in sctp_sf_autoclose_timer_expire(). Fix that too.
> 
> Fixes: 4ff40b86262b ("sctp: set chunk transport correctly when it's a new asoc")
> Signed-off-by: Jere Leppänen <jere.leppanen@nokia.com>

Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>

Re: [PATCH net 2/2] sctp: Fix SHUTDOWN CTSN Ack in the peer restart case

[Marcelo Ricardo Leitner]

On Tue, Apr 21, 2020 at 10:03:42PM +0300, Jere Leppänen wrote:
> 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>

Nice patches. Thanks.

Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>

Re: [PATCH net 2/2] sctp: Fix SHUTDOWN CTSN Ack in the peer restart case

[Marcelo Ricardo Leitner]

On Tue, Apr 21, 2020 at 10:03:42PM +0300, Jere Leppänen wrote:
> 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>

Nice patches. Thanks.

Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>

Re: [PATCH net 0/2] sctp: Fix problems with peer restart when in SHUTDOWN-PENDING state and socket is closed

[David Miller]

From: Jere Leppänen <jere.leppanen@nokia.com>
Date: Tue, 21 Apr 2020 22:03:40 +0300

> These patches are related to the scenario described in commit
> bdf6fa52f01b ("sctp: handle association restarts when the socket is
> closed."). To recap, when our association is in SHUTDOWN-PENDING state
> and we've closed our one-to-one socket, while the peer crashes without
> being detected, restarts and reconnects using the same addresses and
> ports, we start association shutdown.
> 
> In this case, Cumulative TSN Ack in the SHUTDOWN that we send has
> always been incorrect. Additionally, bundling of the SHUTDOWN with the
> COOKIE-ACK was broken by a later commit. This series fixes both of
> these issues.

Series applied, thanks.

Re: [PATCH net 0/2] sctp: Fix problems with peer restart when in SHUTDOWN-PENDING state and socket i

[David Miller]

From: Jere Leppänen <jere.leppanen@nokia.com>
Date: Tue, 21 Apr 2020 22:03:40 +0300

> These patches are related to the scenario described in commit
> bdf6fa52f01b ("sctp: handle association restarts when the socket is
> closed."). To recap, when our association is in SHUTDOWN-PENDING state
> and we've closed our one-to-one socket, while the peer crashes without
> being detected, restarts and reconnects using the same addresses and
> ports, we start association shutdown.
> 
> In this case, Cumulative TSN Ack in the SHUTDOWN that we send has
> always been incorrect. Additionally, bundling of the SHUTDOWN with the
> COOKIE-ACK was broken by a later commit. This series fixes both of
> these issues.

Series applied, thanks.