summaryrefslogtreecommitdiffstats
path: root/sys/netinet/tcp_timer.c
diff options
context:
space:
mode:
authorkib <kib@FreeBSD.org>2007-09-24 14:46:27 +0000
committerkib <kib@FreeBSD.org>2007-09-24 14:46:27 +0000
commitdd74194c9c2f797609185e84b9da95fe9f450ee0 (patch)
tree9c7736afd756484e8896bf244a8d90082707a4ce /sys/netinet/tcp_timer.c
parentb555b05b37e899c841b7d37f35adfe699dc59dc0 (diff)
downloadFreeBSD-src-dd74194c9c2f797609185e84b9da95fe9f450ee0.zip
FreeBSD-src-dd74194c9c2f797609185e84b9da95fe9f450ee0.tar.gz
Revert rev. 1.94. After recent tcp backouts, tcp_close() may return NULL.
Check the return value of tcp_close() being NULL before dereferencing it in #ifdef TCPDEBUG block. Reviewed by: rwatson Approved by: re (gnn)
Diffstat (limited to 'sys/netinet/tcp_timer.c')
-rw-r--r--sys/netinet/tcp_timer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c
index 6680e9b..e0d86d0 100644
--- a/sys/netinet/tcp_timer.c
+++ b/sys/netinet/tcp_timer.c
@@ -240,7 +240,7 @@ tcp_timer_2msl(void *xtp)
}
#ifdef TCPDEBUG
- if (tp->t_inpcb->inp_socket->so_options & SO_DEBUG)
+ if (tp != NULL && (tp->t_inpcb->inp_socket->so_options & SO_DEBUG))
tcp_trace(TA_USER, ostate, tp, (void *)0, (struct tcphdr *)0,
PRU_SLOWTIMO);
#endif
OpenPOWER on IntegriCloud