diff options
| author | tuexen <tuexen@FreeBSD.org> | 2016-01-16 14:54:43 +0000 |
|---|---|---|
| committer | tuexen <tuexen@FreeBSD.org> | 2016-01-16 14:54:43 +0000 |
| commit | 52bf51b039b2ca7f948c15911d8dddf6153c7b15 (patch) | |
| tree | 6b03db6f2c581a0be1a12e266100b1305de4bb0b /sys/netinet | |
| parent | fe5ee5dcb35eb7942826eed67cbd666554ff7023 (diff) | |
| download | FreeBSD-src-52bf51b039b2ca7f948c15911d8dddf6153c7b15.zip FreeBSD-src-52bf51b039b2ca7f948c15911d8dddf6153c7b15.tar.gz | |
MFC r287535:
RFC 4960 requires that packets containing an INIT chunk bundled with
another chunk are silently discarded. Do so, instead of sending an
ABORT.
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 07d2c4e..4837c0c 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. */ |
