[patch -next] tcp: update a call to tcp_metric_set()

Subsystems: networking [general], networking [tcp], the rest

STALE5143d

2 messages, 2 authors, 2012-07-12 · open the first message on its own page

[patch -next] tcp: update a call to tcp_metric_set()

From: Dan Carpenter <hidden>
Date: 2012-07-12 14:47:30

We changed how the metrics were stored so RTAX_CWND needs to be changed
to TCP_METRIC_CWND or it leads to write past the end of the
->tcpm_vals[] array.

Signed-off-by: Dan Carpenter <redacted>
diff --git a/net/ipv4/tcp_metrics.c b/net/ipv4/tcp_metrics.c
index 1fd83d3..c6b0f20 100644
--- a/net/ipv4/tcp_metrics.c
+++ b/net/ipv4/tcp_metrics.c
@@ -412,7 +412,8 @@ void tcp_update_metrics(struct sock *sk)
 				       max(tp->snd_cwnd >> 1, tp->snd_ssthresh));
 		if (!tcp_metric_locked(tm, TCP_METRIC_CWND)) {
 			val = tcp_metric_get(tm, TCP_METRIC_CWND);
-			tcp_metric_set(tm, RTAX_CWND, (val + tp->snd_cwnd) >> 1);
+			tcp_metric_set(tm, TCP_METRIC_CWND,
+				       (val + tp->snd_cwnd) >> 1);
 		}
 	} else {
 		/* Else slow start did not finish, cwnd is non-sense,

Re: [patch -next] tcp: update a call to tcp_metric_set()

From: David Miller <davem@davemloft.net>
Date: 2012-07-12 14:50:44

From: Dan Carpenter <redacted>
Date: Thu, 12 Jul 2012 17:46:38 +0300
We changed how the metrics were stored so RTAX_CWND needs to be changed
to TCP_METRIC_CWND or it leads to write past the end of the
->tcpm_vals[] array.

Signed-off-by: Dan Carpenter <redacted>
Update your tree, this is already fixed.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help