diff options
| author | tuexen <tuexen@FreeBSD.org> | 2015-09-07 14:00:38 +0000 |
|---|---|---|
| committer | tuexen <tuexen@FreeBSD.org> | 2015-09-07 14:00:38 +0000 |
| commit | 8a1adc38eb3ccb21b7d0dddf414cdbe246056fc9 (patch) | |
| tree | 6a858c1ba8737efb7510d989e7033ac00b465877 /sys/netinet | |
| parent | 0bc1e39132872349f177743f9f4d6e6586d7ebf3 (diff) | |
| download | FreeBSD-src-8a1adc38eb3ccb21b7d0dddf414cdbe246056fc9.zip FreeBSD-src-8a1adc38eb3ccb21b7d0dddf414cdbe246056fc9.tar.gz | |
RFC 4960 requires that packets containing an INIT chunk bundled with
another chunk are silently discarded. Do so, instead of sending an
ABORT.
MFC after: 1 week
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/sctp_input.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sys/netinet/sctp_input.c b/sys/netinet/sctp_input.c index a1e2055..297ddf2 100644 --- a/sys/netinet/sctp_input.c +++ b/sys/netinet/sctp_input.c @@ -4819,13 +4819,11 @@ process_control_chunks: /* The INIT chunk must be the only chunk. */ if ((num_chunks > 1) || (length - *offset > (int)SCTP_SIZE32(chk_length))) { - op_err = sctp_generate_cause(SCTP_BASE_SYSCTL(sctp_diag_info_code), - "INIT not the only chunk"); - sctp_abort_association(inp, stcb, m, iphlen, - src, dst, sh, op_err, - mflowtype, mflowid, - vrf_id, port); + /* RFC 4960 requires that no ABORT is sent */ *offset = length; + if (locked_tcb) { + SCTP_TCB_UNLOCK(locked_tcb); + } return (NULL); } /* Honor our resource limit. */ |
