svn commit: r350011 - head/sys/netinet
Michael Tuexen
tuexen at FreeBSD.org
Mon Jul 15 20:45:01 UTC 2019
Author: tuexen
Date: Mon Jul 15 20:45:01 2019
New Revision: 350011
URL: https://svnweb.freebsd.org/changeset/base/350011
Log:
Don't free read control entries, which are still on the stream queue when
adding them the the read queue fails
MFC after: 1 week
Modified:
head/sys/netinet/sctputil.c
Modified: head/sys/netinet/sctputil.c
==============================================================================
--- head/sys/netinet/sctputil.c Mon Jul 15 20:38:56 2019 (r350010)
+++ head/sys/netinet/sctputil.c Mon Jul 15 20:45:01 2019 (r350011)
@@ -4567,12 +4567,14 @@ sctp_add_to_readq(struct sctp_inpcb *inp,
if (inp_read_lock_held == 0)
SCTP_INP_READ_LOCK(inp);
if (inp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_CANT_READ) {
- sctp_free_remote_addr(control->whoFrom);
- if (control->data) {
- sctp_m_freem(control->data);
- control->data = NULL;
+ if (!control->on_strm_q) {
+ sctp_free_remote_addr(control->whoFrom);
+ if (control->data) {
+ sctp_m_freem(control->data);
+ control->data = NULL;
+ }
+ sctp_free_a_readq(stcb, control);
}
- sctp_free_a_readq(stcb, control);
if (inp_read_lock_held == 0)
SCTP_INP_READ_UNLOCK(inp);
return;
@@ -4617,8 +4619,10 @@ sctp_add_to_readq(struct sctp_inpcb *inp,
control->tail_mbuf = prev;
} else {
/* Everything got collapsed out?? */
- sctp_free_remote_addr(control->whoFrom);
- sctp_free_a_readq(stcb, control);
+ if (!control->on_strm_q) {
+ sctp_free_remote_addr(control->whoFrom);
+ sctp_free_a_readq(stcb, control);
+ }
if (inp_read_lock_held == 0)
SCTP_INP_READ_UNLOCK(inp);
return;
More information about the svn-src-all
mailing list