Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7082c5c3 authored by Florian Westphal's avatar Florian Westphal Committed by David S. Miller
Browse files

tcp: zero ca_priv area when switching cc algorithms 



We need to zero out the private data area when application switches
connection to different algorithm (TCP_CONGESTION setsockopt).

When congestion ops get assigned at connect time everything is already
zeroed because sk_alloc uses GFP_ZERO flag.  But in the setsockopt case
this contains whatever previous cc placed there.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7c6ae610

net/ipv4/tcp_cong.c

+3 −1
Original line number Diff line number Diff line
@@ -200,9 +200,11 @@ static void tcp_reinit_congestion_control(struct sock *sk, 
	icsk->icsk_ca_ops = ca;

	icsk->icsk_ca_setsockopt = 1;



	if (sk->sk_state != TCP_CLOSE)

	if (sk->sk_state != TCP_CLOSE) {

		memset(icsk->icsk_ca_priv, 0, sizeof(icsk->icsk_ca_priv));

		tcp_init_congestion_control(sk);

	}

}



/* Manage refcounts on socket close. */

void tcp_cleanup_congestion_control(struct sock *sk)