Commit 9a0a9502 authored by Julian Anastasov's avatar Julian Anastasov Committed by David S. Miller

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: default avatarJulian Anastasov <ja@ssi.bg>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9b70749e
...@@ -107,6 +107,8 @@ static void tcpm_suck_dst(struct tcp_metrics_block *tm, struct dst_entry *dst) ...@@ -107,6 +107,8 @@ static void tcpm_suck_dst(struct tcp_metrics_block *tm, struct dst_entry *dst)
{ {
u32 val; u32 val;
tm->tcpm_stamp = jiffies;
val = 0; val = 0;
if (dst_metric_locked(dst, RTAX_RTT)) if (dst_metric_locked(dst, RTAX_RTT))
val |= 1 << TCP_METRIC_RTT; val |= 1 << TCP_METRIC_RTT;
...@@ -158,7 +160,6 @@ static struct tcp_metrics_block *tcpm_new(struct dst_entry *dst, ...@@ -158,7 +160,6 @@ static struct tcp_metrics_block *tcpm_new(struct dst_entry *dst,
goto out_unlock; goto out_unlock;
} }
tm->tcpm_addr = *addr; tm->tcpm_addr = *addr;
tm->tcpm_stamp = jiffies;
tcpm_suck_dst(tm, dst); tcpm_suck_dst(tm, dst);
...@@ -621,7 +622,7 @@ bool tcp_tw_remember_stamp(struct inet_timewait_sock *tw) ...@@ -621,7 +622,7 @@ bool tcp_tw_remember_stamp(struct inet_timewait_sock *tw)
rcu_read_lock(); rcu_read_lock();
tm = __tcp_get_metrics_tw(tw); tm = __tcp_get_metrics_tw(tw);
if (tw) { if (tm) {
const struct tcp_timewait_sock *tcptw; const struct tcp_timewait_sock *tcptw;
struct sock *sk = (struct sock *) tw; struct sock *sk = (struct sock *) tw;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment