Skip to content

Commit c120144

Browse files
tracywwnjdavem330
authored andcommitted
tcp: memset ca_priv data to 0 properly
Always zero out ca_priv data in tcp_assign_congestion_control() so that ca_priv data is cleared out during socket creation. Also always zero out ca_priv data in tcp_reinit_congestion_control() so that when cc algorithm is changed, ca_priv data is cleared out as well. We should still zero out ca_priv data even in TCP_CLOSE state because user could call connect() on AF_UNSPEC to disconnect the socket and leave it in TCP_CLOSE state and later call setsockopt() to switch cc algorithm on this socket. Fixes: 2b0a8c9 ("tcp: add CDG congestion control") Reported-by: Andrey Konovalov <[email protected]> Signed-off-by: Wei Wang <[email protected]> Acked-by: Eric Dumazet <[email protected]> Acked-by: Yuchung Cheng <[email protected]> Acked-by: Neal Cardwell <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 199ab00 commit c120144

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

net/ipv4/tcp_cong.c

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -168,12 +168,8 @@ void tcp_assign_congestion_control(struct sock *sk)
168168
}
169169
out:
170170
rcu_read_unlock();
171+
memset(icsk->icsk_ca_priv, 0, sizeof(icsk->icsk_ca_priv));
171172

172-
/* Clear out private data before diag gets it and
173-
* the ca has not been initialized.
174-
*/
175-
if (ca->get_info)
176-
memset(icsk->icsk_ca_priv, 0, sizeof(icsk->icsk_ca_priv));
177173
if (ca->flags & TCP_CONG_NEEDS_ECN)
178174
INET_ECN_xmit(sk);
179175
else
@@ -200,11 +196,10 @@ static void tcp_reinit_congestion_control(struct sock *sk,
200196
tcp_cleanup_congestion_control(sk);
201197
icsk->icsk_ca_ops = ca;
202198
icsk->icsk_ca_setsockopt = 1;
199+
memset(icsk->icsk_ca_priv, 0, sizeof(icsk->icsk_ca_priv));
203200

204-
if (sk->sk_state != TCP_CLOSE) {
205-
memset(icsk->icsk_ca_priv, 0, sizeof(icsk->icsk_ca_priv));
201+
if (sk->sk_state != TCP_CLOSE)
206202
tcp_init_congestion_control(sk);
207-
}
208203
}
209204

210205
/* Manage refcounts on socket close. */

0 commit comments

Comments
 (0)