Skip to content

Commit

Permalink
Fix a small bug in the tcp_log_id where the bucket
Browse files Browse the repository at this point in the history
was unlocked and yet the bucket-unlock flag was not
changed to false. This can cause a panic if INVARIANTS
is on and we go through the right path (though rare).

Reported by:	syzbot+179a1ad49f3c4c215fa2@syzkaller.appspotmail.com
Reviewed by:	tuexen@
MFC after:	1 week
  • Loading branch information
rrs authored and rrs committed Mar 26, 2019
1 parent 61c8251 commit b6ca75d
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion sys/netinet/tcp_output.c
Expand Up @@ -138,7 +138,8 @@ SYSCTL_INT(_net_inet_tcp, OID_AUTO, sendbuf_auto_lowat, CTLFLAG_VNET | CTLFLAG_R
* non-ACK.
*/
#define TCP_XMIT_TIMER_ASSERT(tp, len, th_flags) \
KASSERT(((len) == 0 && ((th_flags) & (TH_SYN | TH_FIN)) == 0) ||\
KASSERT(((len) == 0 && ((th_flags) & \
(TH_SYN | TH_FIN | TH_RST)) != 0) || \
tcp_timer_active((tp), TT_REXMT) || \
tcp_timer_active((tp), TT_PERSIST), \
("neither rexmt nor persist timer is set"))
Expand Down

0 comments on commit b6ca75d

Please sign in to comment.