diff options
| author |   Jere Leppänen <jere.leppanen@nokia.com> | 2020-04-21 22:03:42 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-04-22 19:27:40 -0700 |
| commit | 12dfd78e3a74825e6f0bc8df7ef9f938fbc6bfe3 (patch) | |
| tree | bb3cb42d6ee511b336bcbd7a4617d9f604ab2cb5 /net/sctp/sm_make_chunk.c | |
| parent | sctp: Fix bundling of SHUTDOWN with COOKIE-ACK (diff) | |
| download | linux-dev-12dfd78e3a74825e6f0bc8df7ef9f938fbc6bfe3.tar.xz linux-dev-12dfd78e3a74825e6f0bc8df7ef9f938fbc6bfe3.zip | |
sctp: Fix SHUTDOWN CTSN Ack in the peer restart case
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>
Diffstat (limited to 'net/sctp/sm_make_chunk.c')
| -rw-r--r-- | net/sctp/sm_make_chunk.c | 6 |
1 files changed, 5 insertions, 1 deletions
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, |