Skip to content
This repository has been archived by the owner on Apr 18, 2024. It is now read-only.

Commit

Permalink
mptcp: Trigger sending when new subflow gets established
Browse files Browse the repository at this point in the history
We can run into a situation where we run out of subflows but have data
sitting the write-queue or reinject-queue. When a new subflow comes in,
we have to trigger sending right away.

Fixes: Zero-day bug
Signed-off-by: Christoph Paasch <[email protected]>
Signed-off-by: Matthieu Baerts <[email protected]>
  • Loading branch information
cpaasch authored and matttbe committed Feb 1, 2019
1 parent 88eee5e commit 14e9764
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions net/ipv4/tcp_input.c
Original file line number Diff line number Diff line change
Expand Up @@ -6283,10 +6283,13 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb)
* using an MP_JOIN subtype.
*/
if (mptcp(tp)) {
if (is_master_tp(tp))
if (is_master_tp(tp)) {
mptcp_update_metasocket(mptcp_meta_sk(sk));
else
} else {
tcp_send_ack(sk);

mptcp_push_pending_frames(mptcp_meta_sk(sk));
}
}
break;

Expand Down

0 comments on commit 14e9764

Please sign in to comment.