| Message ID | 20200421190342.548226-3-jere.leppanen@nokia.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | sctp: Fix problems with peer restart when in SHUTDOWN-PENDING state and socket is closed | expand |
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>
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,
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(-)