Commit 4e9120cb authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'mptcp-fixes-for-5-17' 

Mat Martineau says:

====================
mptcp: Fixes for 5.17

Patch 1 fixes a MPTCP selftest bug that combined the results of two
separate tests in the test output.

Patch 2 fixes a problem where advertised IPv6 addresses were not actually
available for incoming MP_JOIN requests.
====================

Link: https://lore.kernel.org/r/20220210012508.226880-1-mathew.j.martineau@linux.intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 8ecbb179 029744cd

net/mptcp/pm_netlink.c

+6 −2
Original line number Diff line number Diff line
@@ -925,6 +925,7 @@ static int mptcp_pm_nl_append_new_local_addr(struct pm_nl_pernet *pernet, 
static int mptcp_pm_nl_create_listen_socket(struct sock *sk,

					    struct mptcp_pm_addr_entry *entry)

{

	int addrlen = sizeof(struct sockaddr_in);

	struct sockaddr_storage addr;

	struct mptcp_sock *msk;

	struct socket *ssock;
@@ -949,8 +950,11 @@ static int mptcp_pm_nl_create_listen_socket(struct sock *sk, 
	}



	mptcp_info2sockaddr(&entry->addr, &addr, entry->addr.family);

	err = kernel_bind(ssock, (struct sockaddr *)&addr,

			  sizeof(struct sockaddr_in));

#if IS_ENABLED(CONFIG_MPTCP_IPV6)

	if (entry->addr.family == AF_INET6)

		addrlen = sizeof(struct sockaddr_in6);

#endif

	err = kernel_bind(ssock, (struct sockaddr *)&addr, addrlen);

	if (err) {

		pr_warn("kernel_bind error, err=%d", err);

		goto out;

tools/testing/selftests/net/mptcp/mptcp_join.sh

+1 −0
Original line number Diff line number Diff line
@@ -1159,6 +1159,7 @@ signal_address_tests() 
	ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags signal

	ip netns exec $ns2 ./pm_nl_ctl add 10.0.4.2 flags signal

	run_tests $ns1 $ns2 10.0.1.1

	chk_join_nr "signal addresses race test" 3 3 3



	# the server will not signal the address terminating

	# the MPC subflow