Author: tuexen
Date: Fri Feb 10 07:23:42 2012
New Revision: 231354
URL: http://svn.freebsd.org/changeset/base/231354
Log:
MFC r216821:
Fix three bugs related to the sequence number wrap-around affecting
the processing of ECNE and ASCONF chunks.
Modified:
stable/8/sys/netinet/sctp_asconf.c
stable/8/sys/netinet/sctp_input.c
stable/8/sys/netinet/sctp_output.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/boot/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/e1000/ (props changed)
Modified: stable/8/sys/netinet/sctp_asconf.c
==============================================================================
--- stable/8/sys/netinet/sctp_asconf.c Fri Feb 10 07:21:29 2012
(r231353)
+++ stable/8/sys/netinet/sctp_asconf.c Fri Feb 10 07:23:42 2012
(r231354)
@@ -632,7 +632,7 @@ sctp_handle_asconf(struct mbuf *m, unsig
asoc = &stcb->asoc;
serial_num = ntohl(cp->serial_number);
- if (compare_with_wrap(asoc->asconf_seq_in, serial_num, MAX_SEQ) ||
+ if (compare_with_wrap(asoc->asconf_seq_in, serial_num, MAX_TSN) ||
serial_num == asoc->asconf_seq_in) {
/* got a duplicate ASCONF */
SCTPDBG(SCTP_DEBUG_ASCONF1,
Modified: stable/8/sys/netinet/sctp_input.c
==============================================================================
--- stable/8/sys/netinet/sctp_input.c Fri Feb 10 07:21:29 2012
(r231353)
+++ stable/8/sys/netinet/sctp_input.c Fri Feb 10 07:23:42 2012
(r231354)
@@ -2946,7 +2946,7 @@ sctp_handle_ecn_echo(struct sctp_ecne_ch
net = lchk->whoTo;
break;
}
- if (compare_with_wrap(lchk->rec.data.TSN_seq, tsn, MAX_SEQ))
+ if (compare_with_wrap(lchk->rec.data.TSN_seq, tsn, MAX_TSN))
break;
lchk = TAILQ_NEXT(lchk, sctp_next);
}
Modified: stable/8/sys/netinet/sctp_output.c
==============================================================================
--- stable/8/sys/netinet/sctp_output.c Fri Feb 10 07:21:29 2012
(r231353)
+++ stable/8/sys/netinet/sctp_output.c Fri Feb 10 07:23:42 2012
(r231354)
@@ -6477,7 +6477,7 @@ sctp_toss_old_asconf(struct sctp_tcb *st
if (chk->rec.chunk_id.id == SCTP_ASCONF) {
if (chk->data) {
acp = mtod(chk->data, struct sctp_asconf_chunk
*);
- if
(compare_with_wrap(ntohl(acp->serial_number), stcb->asoc.asconf_seq_out_acked,
MAX_SEQ)) {
+ if
(compare_with_wrap(ntohl(acp->serial_number), stcb->asoc.asconf_seq_out_acked,
MAX_TSN)) {
/* Not Acked yet */
break;
}
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
