tcp: fix tcp_init_transfer() to not reset icsk_ca_initialized
Subsystems (4)
PATCH v6 1/1 tcp: fix tcp_init_transfer() to not reset icsk_ca_initialized
This commit fixes a bug (found by syzkaller) that could cause spurious double-initializations for congestion control modules, which could cause memory leaks or other problems for congestion control modules (like CDG) that allocate memory in their init functions.
The buggy scenario constructed by syzkaller was something like:
(1) create a TCP socket
(2) initiate a TFO connect via sendto()
(3) while socket is in TCP_SYN_SENT, call setsockopt(TCP_CONGESTION),
which calls:
tcp_set_congestion_control() ->
tcp_reinit_congestion_control() ->
tcp_init_congestion_control()(4) receive ACK, connection is established, call tcp_init_transfer(), set icsk_ca_initialized=0 (without first calling cc->release()), call tcp_init_congestion_control() again.
Note that in this sequence tcp_init_congestion_control() is called twice without a cc->release() call in between. Thus, for CC modules that allocate memory in their init() function, e.g, CDG, a memory leak may occur. The syzkaller tool managed to find a reproducer that triggered such a leak in CDG.
The bug was introduced when that commit 8919a9b31eb4 ("tcp: Only init congestion control if not initialized already")
introduced icsk_ca_initialized and set icsk_ca_initialized to 0 in tcp_init_transfer(), missing the possibility for a sequence like the one above, where a process could call setsockopt(TCP_CONGESTION) in state TCP_SYN_SENT (i.e. after the connect() or TFO open sendmsg()), which would call tcp_init_congestion_control(). It did not intend to reset any initialization that the user had already explicitly made; it just missed the possibility of that particular sequence (which syzkaller managed to find).
---
V2: - Modify the Subject line.
- Adjust the commit message.
- Add Fixes: tag.
V3: - Fix netdev/verify_fixes format error. V4: - Add blamed authors to receiver list. V5: - Add comment about the congestion control initialization. V6: - Fix typo in commit message. net/ipv4/tcp_input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/tcp_input.c +1 -1
@@ -5922,8 +5922,8 @@ void tcp_init_transfer(struct sock *sk, int bpf_op, struct sk_buff *skb) tp->snd_cwnd =tcp_init_cwnd (tp,__sk_dst_get (sk)); tp->snd_cwnd_stamp = tcp_jiffies32; - icsk->icsk_ca_initialized =0 ;bpf_skops_established (sk, bpf_op, skb); +/* Initialize congestion control unless BPF initialized it already: */ if (!icsk->icsk_ca_initialized)tcp_init_congestion_control (sk);tcp_init_buffer_space (sk);
--
2.25.1
_______________________________________________
Linux-kernel-mentees mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
Quoted 55 lines · Nguyen Dinh Phi
This commit fixes a bug (found by syzkaller) that could cause spurious double-initializations for congestion control modules, which could cause memory leaks or other problems for congestion control modules (like CDG) that allocate memory in their init functions.
The buggy scenario constructed by syzkaller was something like:
(1) create a TCP socket
(2) initiate a TFO connect viasendto()
(3) while socket is inTCP_SYN_SENT, callsetsockopt(TCP_CONGESTION),which calls: tcp_set_congestion_control() -> tcp_reinit_congestion_control() -> tcp_init_congestion_control()(4) receive ACK, connection is established, call
tcp_init_transfer(), set icsk_ca_initialized=0 (without first callingcc->release()), calltcp_init_congestion_control()again.Note that in this sequence
tcp_init_congestion_control()is called twice without acc->release()call in between. Thus, for CC modules that allocate memory in theirinit()function, e.g, CDG, a memory leak may occur. The syzkaller tool managed to find a reproducer that triggered such a leak in CDG.The bug was introduced when that commit
8919a9b31eb4("tcp: Only init congestion control if not initialized already")
introducedicsk_ca_initializedand seticsk_ca_initializedto 0 intcp_init_transfer(), missing the possibility for a sequence like the one above, where a process could callsetsockopt(TCP_CONGESTION)in stateTCP_SYN_SENT(i.e. after theconnect()or TFO opensendmsg()), which would calltcp_init_congestion_control(). It did not intend to reset any initialization that the user had already explicitly made; it just missed the possibility of that particular sequence (which syzkaller managed to find).Fixes 8919a9b31eb4 ("tcp: Only init congestion control if not initialized already")Reported-by [email protected]Signed-off-by Nguyen Dinh Phi <[email protected]>---
V2: - Modify the Subject line.
- Adjust the commit message.
- Add Fixes: tag.V3: - Fix netdev/verify_fixes format error. V4: - Add blamed authors to receiver list. V5: - Add comment about the congestion control initialization. V6: - Fix typo in commit message. net/ipv4/tcp_input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)net/ipv4/tcp_input.c +0
-0
net/ipv4/tcp_input.c void tcp_init_transfer(struct sock *sk, int bpf_op, struct sk_buff *skb)
Quoted 10 lines
net/ipv4/tcp_input.c +1
-2@@ -5922,8 +5922,8 @@ void tcp_init_transfer(struct sock *sk, int bpf_op, struct sk_buff *skb) tp->snd_cwnd =tcp_init_cwnd (tp,__sk_dst_get (sk)); tp->snd_cwnd_stamp = tcp_jiffies32; - icsk->icsk_ca_initialized =0 ;bpf_skops_established (sk, bpf_op, skb); +/* Initialize congestion control unless BPF initialized it already: */ if (!icsk->icsk_ca_initialized)tcp_init_congestion_control (sk);tcp_init_buffer_space (sk); --
Looks good to me. Thanks for the fix!
neal
_______________________________________________
Linux-kernel-mentees mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees