FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-02-02 00:54:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tcp: avoid oops in tcp_metrics and reset tcpm_stamp

Browse Source 
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>
This commit is contained in:
Julian Anastasov 2012-07-23 10:46:38 +03:00 committed by David S. Miller
parent 9b70749e64
commit 9a0a9502cb
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/ipv4/tcp_metrics.c
View File

@ -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,
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)
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;