diff options
| author | Julian Anastasov <ja@ssi.bg> | 2012-07-23 10:46:38 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-23 00:57:12 -0700 |
| commit | 9a0a9502cbf19d31f7387e3066f3d1a491bef616 (patch) | |
| tree | de744eaedb4c0942fab7d0c6af583460b2803fa0 /net | |
| parent | 9b70749e64132e17ab02239b82fcb4a2c55554d1 (diff) | |
| download | linux-3.10-9a0a9502cbf19d31f7387e3066f3d1a491bef616.tar.gz linux-3.10-9a0a9502cbf19d31f7387e3066f3d1a491bef616.tar.bz2 linux-3.10-9a0a9502cbf19d31f7387e3066f3d1a491bef616.zip | |
tcp: avoid oops in tcp_metrics and reset tcpm_stamp
In tcp_tw_remember_stamp we incorrectly checked tw
instead of tm, it can lead to oops if the cached entry is
not found.
tcpm_stamp was not updated in tcpm_check_stamp when
tcpm_suck_dst was called, move the update into tcpm_suck_dst,
so that we do not call it infinitely on every next cache hit
after TCP_METRICS_TIMEOUT.
Signed-off-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/tcp_metrics.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv4/tcp_metrics.c b/net/ipv4/tcp_metrics.c index 992f1bff4fc..2288a6399e1 100644 --- a/net/ipv4/tcp_metrics.c +++ b/net/ipv4/tcp_metrics.c @@ -107,6 +107,8 @@ static void tcpm_suck_dst(struct tcp_metrics_block *tm, struct dst_entry *dst) { u32 val; + tm->tcpm_stamp = jiffies; + val = 0; if (dst_metric_locked(dst, RTAX_RTT)) val |= 1 << TCP_METRIC_RTT; @@ -158,7 +160,6 @@ static struct tcp_metrics_block *tcpm_new(struct dst_entry *dst, goto out_unlock; } tm->tcpm_addr = *addr; - tm->tcpm_stamp = jiffies; tcpm_suck_dst(tm, dst); @@ -621,7 +622,7 @@ bool tcp_tw_remember_stamp(struct inet_timewait_sock *tw) rcu_read_lock(); tm = __tcp_get_metrics_tw(tw); - if (tw) { + if (tm) { const struct tcp_timewait_sock *tcptw; struct sock *sk = (struct sock *) tw; |