diff options
| author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2018-01-23 21:06:48 +0000 |
|---|---|---|
| committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2018-01-23 21:06:48 +0000 |
| commit | 4d9990281351206a2a8178da509c0d2169d2ab11 (patch) | |
| tree | 8a2fd3c5bcfd2d385eef04200a791b427e1a5456 | |
| parent | 1fc1cafb96de24c4d27854efc3ccfb8e6dd1e292 (diff) | |
Although it is a dead store here, always reassign the tcpcb after
calling tcp_close(), tcp_drop(), and tcp_disconnect(). Then no
freed memory can be used after closing a TCP connection.
OK mikeb@ mpi@
| -rw-r--r-- | sys/netinet/tcp_timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c index 1260d14d53e..acacbe7dcf8 100644 --- a/sys/netinet/tcp_timer.c +++ b/sys/netinet/tcp_timer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_timer.c,v 1.60 2017/10/29 14:56:36 florian Exp $ */ +/* $OpenBSD: tcp_timer.c,v 1.61 2018/01/23 21:06:47 bluhm Exp $ */ /* $NetBSD: tcp_timer.c,v 1.14 1996/02/13 23:44:09 christos Exp $ */ /* @@ -218,7 +218,7 @@ tcp_timer_rexmt(void *arg) if (++tp->t_rxtshift > TCP_MAXRXTSHIFT) { tp->t_rxtshift = TCP_MAXRXTSHIFT; tcpstat_inc(tcps_timeoutdrop); - (void)tcp_drop(tp, tp->t_softerror ? + tp = tcp_drop(tp, tp->t_softerror ? tp->t_softerror : ETIMEDOUT); goto out; } |