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

Assert the tcbinfo lock whenever tcp_close() is to be called by

Browse Source 
tcp_input().

MFC after:	7 days
This commit is contained in:
rwatson 2005-06-01 11:49:14 +00:00
parent a5b21ce8f4
commit fe0bf623ad
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/netinet/tcp_input.c
View File

@ -1539,11 +1539,16 @@ tcp_input(m, off0)
close:
tp->t_state = TCPS_CLOSED;
tcpstat.tcps_drops++;
KASSERT(headlocked, ("tcp_input: "
"trimthenstep6: tcp_close: head not "
"locked"));
tp = tcp_close(tp);
break;
case TCPS_CLOSING:
case TCPS_LAST_ACK:
KASSERT(headlocked, ("trimthenstep6: "
"tcp_close.2: head not locked"));
tp = tcp_close(tp);
break;
@ -1651,6 +1656,8 @@ tcp_input(m, off0)
*/
if ((so->so_state & SS_NOFDREF) &&
tp->t_state > TCPS_CLOSE_WAIT && tlen) {
KASSERT(headlocked, ("trimthenstep6: tcp_close.3: head not "
"locked"));
tp = tcp_close(tp);
tcpstat.tcps_rcvafterclose++;
rstreason = BANDLIM_UNLIMITED;
@ -1676,6 +1683,8 @@ tcp_input(m, off0)
if (thflags & TH_SYN &&
tp->t_state == TCPS_TIME_WAIT &&
SEQ_GT(th->th_seq, tp->rcv_nxt)) {
KASSERT(headlocked, ("trimthenstep6: "
"tcp_close.4: head not locked"));
tp = tcp_close(tp);
goto findpcb;
}
@ -2178,6 +2187,8 @@ tcp_input(m, off0)
*/
case TCPS_LAST_ACK:
if (ourfinisacked) {
KASSERT(headlocked, ("tcp_input: process_ACK:"
" tcp_close: head not locked"));
tp = tcp_close(tp);
goto drop;
}

11
sys/netinet/tcp_reass.c
View File

@ -1539,11 +1539,16 @@ tcp_input(m, off0)
close:
tp->t_state = TCPS_CLOSED;
tcpstat.tcps_drops++;
KASSERT(headlocked, ("tcp_input: "
"trimthenstep6: tcp_close: head not "
"locked"));
tp = tcp_close(tp);
break;
case TCPS_CLOSING:
case TCPS_LAST_ACK:
KASSERT(headlocked, ("trimthenstep6: "
"tcp_close.2: head not locked"));
tp = tcp_close(tp);
break;
@ -1651,6 +1656,8 @@ tcp_input(m, off0)
*/
if ((so->so_state & SS_NOFDREF) &&
tp->t_state > TCPS_CLOSE_WAIT && tlen) {
KASSERT(headlocked, ("trimthenstep6: tcp_close.3: head not "
"locked"));
tp = tcp_close(tp);
tcpstat.tcps_rcvafterclose++;
rstreason = BANDLIM_UNLIMITED;
@ -1676,6 +1683,8 @@ tcp_input(m, off0)
if (thflags & TH_SYN &&
tp->t_state == TCPS_TIME_WAIT &&
SEQ_GT(th->th_seq, tp->rcv_nxt)) {
KASSERT(headlocked, ("trimthenstep6: "
"tcp_close.4: head not locked"));
tp = tcp_close(tp);
goto findpcb;
}
@ -2178,6 +2187,8 @@ tcp_input(m, off0)
*/
case TCPS_LAST_ACK:
if (ourfinisacked) {
KASSERT(headlocked, ("tcp_input: process_ACK:"
" tcp_close: head not locked"));
tp = tcp_close(tp);
goto drop;
}