Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PR/22551: Invoking tcpcb's get erroneously free'd resulting in to_ticks <= 0 

assertion. Approved by he.
This commit is contained in:
christos 2004-04-05 21:49:21 +00:00
parent 5a95d1e200
commit 99d2bc9467
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

@ -1,4 +1,4 @@
/* $NetBSD: tcp_subr.c,v 1.160 2004/01/07 19:15:43 matt Exp $ */
/* $NetBSD: tcp_subr.c,v 1.161 2004/04/05 21:49:21 christos Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@ -98,7 +98,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: tcp_subr.c,v 1.160 2004/01/07 19:15:43 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: tcp_subr.c,v 1.161 2004/04/05 21:49:21 christos Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@ -1066,9 +1066,9 @@ tcp_drop(tp, errno)
* be taken, as we are about to release this tcpcb. The release
* of the storage will be done if this is the last timer running.
*
* This is typically called from the callout handler function before
* callout_ack() is done, therefore we need to test the number of
* running timer functions against 1 below, not 0.
* This should be called from the callout handler function after
* callout_ack() is done, so that the number of invoking timer
* functions is 0.
*/
int
tcp_isdead(tp)
@ -1077,7 +1077,7 @@ tcp_isdead(tp)
int dead = (tp->t_flags & TF_DEAD);
if (__predict_false(dead)) {
if (tcp_timers_invoking(tp) > 1)
if (tcp_timers_invoking(tp) > 0)
/* not quite there yet -- count separately? */
return dead;
tcpstat.tcps_delayed_free++;