Commit d4d8dcd8 authored by jan.koester's avatar jan.koester
Browse files

some fixes

parent 995383b1

net/mptcp/subflow.c

+16 −22
Original line number Diff line number Diff line
@@ -421,29 +421,26 @@ static bool subflow_use_different_dport(struct mptcp_sock *msk, const struct soc 


void __mptcp_sync_state(struct sock *sk, int state)

{

	struct mptcp_subflow_context *subflow;

	struct mptcp_sock *msk = mptcp_sk(sk);

	struct sock *ssk = msk->first;



	subflow = mptcp_subflow_ctx(ssk);

	__mptcp_propagate_sndbuf(sk, ssk);

	if (!msk->rcvspace_init)

		mptcp_rcv_space_init(msk, ssk);



	__mptcp_propagate_sndbuf(sk, msk->first);

	if (sk->sk_state == TCP_SYN_SENT) {

		inet_sk_state_store(sk, state);

		/* subflow->idsn is always available is TCP_SYN_SENT state,

		 * even for the FASTOPEN scenarios

		 */

		WRITE_ONCE(msk->write_seq, subflow->idsn + 1);

		WRITE_ONCE(msk->snd_nxt, msk->write_seq);

		mptcp_set_state(sk, state);

		sk->sk_state_change(sk);

	}

}



static void mptcp_propagate_state(struct sock *sk, struct sock *ssk)

{

	struct mptcp_sock *msk = mptcp_sk(sk);



	mptcp_data_lock(sk);

	if (!sock_owned_by_user(sk)) {

		__mptcp_sync_state(sk, ssk->sk_state);

	} else {

		msk->pending_state = ssk->sk_state;

		__set_bit(MPTCP_SYNC_STATE, &msk->cb_flags);

	}

	mptcp_data_unlock(sk);

}



static void subflow_set_remote_key(struct mptcp_sock *msk,

				   struct mptcp_subflow_context *subflow,

				   const struct mptcp_options_received *mp_opt)
@@ -524,10 +521,9 @@ static void subflow_finish_connect(struct sock *sk, const struct sk_buff *skb) 
		if (mp_opt.deny_join_id0)

			WRITE_ONCE(msk->pm.remote_deny_join_id0, true);

		subflow->mp_capable = 1;

		subflow_set_remote_key(msk, subflow, &mp_opt);

		MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPCAPABLEACTIVEACK);

		mptcp_finish_connect(sk);

		mptcp_propagate_state(parent, sk);

		mptcp_propagate_state(parent, sk, subflow, &mp_opt);

	} else if (subflow->request_join) {

		u8 hmac[SHA256_DIGEST_SIZE];
@@ -570,8 +566,7 @@ static void subflow_finish_connect(struct sock *sk, const struct sk_buff *skb) 
		}

	} else if (mptcp_check_fallback(sk)) {

fallback:

		mptcp_rcv_space_init(msk, sk);

		mptcp_propagate_state(parent, sk);

		mptcp_propagate_state(parent, sk, subflow, NULL);

	}

	return;
@@ -1760,10 +1755,9 @@ static void subflow_state_change(struct sock *sk) 
	msk = mptcp_sk(parent);

	if (subflow_simultaneous_connect(sk)) {

		mptcp_do_fallback(sk);

		mptcp_rcv_space_init(msk, sk);

		pr_fallback(msk);

		subflow->conn_finished = 1;

		mptcp_propagate_state(parent, sk);

		mptcp_propagate_state(parent, sk, subflow, NULL);

	}



	/* as recvmsg() does not acquire the subflow socket for ssk selection