diff options
| author | tuexen <tuexen@FreeBSD.org> | 2010-09-20 12:19:11 +0000 |
|---|---|---|
| committer | tuexen <tuexen@FreeBSD.org> | 2010-09-20 12:19:11 +0000 |
| commit | b713b016000d8467dd3e595d482b9389593a7ecc (patch) | |
| tree | 9bbc7b74596a8679b26ea50bf373578d6d6e2b00 /sys/netinet/sctp_indata.c | |
| parent | 3ded34188e98793e8934a4bf914a17a86ba1ef1c (diff) | |
| download | FreeBSD-src-b713b016000d8467dd3e595d482b9389593a7ecc.zip FreeBSD-src-b713b016000d8467dd3e595d482b9389593a7ecc.tar.gz | |
Fix a locking issue which resulted in aborted associations
due to a corrupted nr-mapping array.
MFC after: 2 weeks.
Diffstat (limited to 'sys/netinet/sctp_indata.c')
| -rw-r--r-- | sys/netinet/sctp_indata.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/netinet/sctp_indata.c b/sys/netinet/sctp_indata.c index 1040c9d..6cae72e 100644 --- a/sys/netinet/sctp_indata.c +++ b/sys/netinet/sctp_indata.c @@ -1776,6 +1776,10 @@ sctp_process_a_data_chunk(struct sctp_tcb *stcb, struct sctp_association *asoc, if (control == NULL) { goto failed_express_del; } + SCTP_SET_TSN_PRESENT(asoc->nr_mapping_array, gap); + if (compare_with_wrap(tsn, asoc->highest_tsn_inside_nr_map, MAX_TSN)) { + asoc->highest_tsn_inside_nr_map = tsn; + } sctp_add_to_readq(stcb->sctp_ep, stcb, control, &stcb->sctp_socket->so_rcv, 1, SCTP_READ_LOCK_NOT_HELD, SCTP_SO_NOT_LOCKED); @@ -1791,10 +1795,6 @@ sctp_process_a_data_chunk(struct sctp_tcb *stcb, struct sctp_association *asoc, } control = NULL; - SCTP_SET_TSN_PRESENT(asoc->nr_mapping_array, gap); - if (compare_with_wrap(tsn, asoc->highest_tsn_inside_nr_map, MAX_TSN)) { - asoc->highest_tsn_inside_nr_map = tsn; - } goto finish_express_del; } failed_express_del: |
