d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix KASSERT during tcp_newtcpcb when low on memory

Browse Source 
While testing with system default cc set to cubic, and
running a memory exhaustion validation, FreeBSD panics for a
missing inpcb reference / lock.

Reviewed by:	rgrimes (mentor), tuexen (mentor)
Approved by:	rgrimes (mentor), tuexen (mentor)
MFC after:	3 weeks
Sponsored by:	NetApp, Inc.
Differential Revision:	https://reviews.freebsd.org/D25583
This commit is contained in:
Richard Scheffenegger 2020-07-07 12:10:59 +00:00
parent 3aa99676b4
commit c201ce0b4a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/netinet/tcp_subr.c
View File

@ -1702,6 +1702,12 @@ tcp_newtcpcb(struct inpcb *inp)
KASSERT(!STAILQ_EMPTY(&cc_list), ("cc_list is empty!")); KASSERT(!STAILQ_EMPTY(&cc_list), ("cc_list is empty!"));
CC_ALGO(tp) = CC_DEFAULT(); CC_ALGO(tp) = CC_DEFAULT();
CC_LIST_RUNLOCK(); CC_LIST_RUNLOCK();
/*
* The tcpcb will hold a reference on its inpcb until tcp_discardcb()
* is called.
*/
in_pcbref(inp); /* Reference for tcpcb */
tp->t_inpcb = inp;
if (CC_ALGO(tp)->cb_init != NULL) if (CC_ALGO(tp)->cb_init != NULL)
if (CC_ALGO(tp)->cb_init(tp->ccv) > 0) { if (CC_ALGO(tp)->cb_init(tp->ccv) > 0) {
@ -1746,12 +1752,6 @@ tcp_newtcpcb(struct inpcb *inp)
if (V_tcp_do_sack) if (V_tcp_do_sack)
tp->t_flags |= TF_SACK_PERMIT; tp->t_flags |= TF_SACK_PERMIT;
TAILQ_INIT(&tp->snd_holes); TAILQ_INIT(&tp->snd_holes);
/*
* The tcpcb will hold a reference on its inpcb until tcp_discardcb()
* is called.
*/
in_pcbref(inp); /* Reference for tcpcb */
tp->t_inpcb = inp;
/* /*
* Init srtt to TCPTV_SRTTBASE (0), so we can tell that we have no * Init srtt to TCPTV_SRTTBASE (0), so we can tell that we have no