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

Assert that tcbinfo is locked in tcp_input() before calling into

Browse Source 
tcp_drop().

MFC after:	7 days
This commit is contained in:
rwatson 2005-06-01 12:03:18 +00:00
parent fe0bf623ad
commit 07bd5e1d17
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/netinet/tcp_input.c
View File

@ -1054,6 +1054,9 @@ after_listen:
inet_ntoa(inp->inp_inc.inc_faddr),
inp->inp_inc.inc_fport,
tp->rcv_byps / tp->rcv_pps);
KASSERT(headlocked, ("tcp_input: "
"after_listen: tcp_drop: head "
"not locked"));
tp = tcp_drop(tp, ECONNRESET);
tcpstat.tcps_minmssdrops++;
goto drop;
@ -1341,8 +1344,11 @@ after_listen:
goto dropwithreset;
}
if (thflags & TH_RST) {
if (thflags & TH_ACK)
if (thflags & TH_ACK) {
KASSERT(headlocked, ("tcp_input: after_listen"
": tcp_drop.2: head not locked"));
tp = tcp_drop(tp, ECONNREFUSED);
}
goto drop;
}
if ((thflags & TH_SYN) == 0)
@ -1738,6 +1744,8 @@ trimthenstep6:
* error and we send an RST and drop the connection.
*/
if (thflags & TH_SYN) {
KASSERT(headlocked, ("tcp_input: tcp_drop: trimthenstep6: "
"head not locked"));
tp = tcp_drop(tp, ECONNRESET);
rstreason = BANDLIM_UNLIMITED;
goto drop;

10
sys/netinet/tcp_reass.c
View File

@ -1054,6 +1054,9 @@ after_listen:
inet_ntoa(inp->inp_inc.inc_faddr),
inp->inp_inc.inc_fport,
tp->rcv_byps / tp->rcv_pps);
KASSERT(headlocked, ("tcp_input: "
"after_listen: tcp_drop: head "
"not locked"));
tp = tcp_drop(tp, ECONNRESET);
tcpstat.tcps_minmssdrops++;
goto drop;
@ -1341,8 +1344,11 @@ after_listen:
goto dropwithreset;
}
if (thflags & TH_RST) {
if (thflags & TH_ACK)
if (thflags & TH_ACK) {
KASSERT(headlocked, ("tcp_input: after_listen"
": tcp_drop.2: head not locked"));
tp = tcp_drop(tp, ECONNREFUSED);
}
goto drop;
}
if ((thflags & TH_SYN) == 0)
@ -1738,6 +1744,8 @@ trimthenstep6:
* error and we send an RST and drop the connection.
*/
if (thflags & TH_SYN) {
KASSERT(headlocked, ("tcp_input: tcp_drop: trimthenstep6: "
"head not locked"));
tp = tcp_drop(tp, ECONNRESET);
rstreason = BANDLIM_UNLIMITED;
goto drop;