Commit 029744cd authored by Kishen Maloor's avatar Kishen Maloor Committed by Jakub Kicinski
Browse files

mptcp: netlink: process IPv6 addrs in creating listening sockets 



This change updates mptcp_pm_nl_create_listen_socket() to create
listening sockets bound to IPv6 addresses (where IPv6 is supported).

Fixes: 1729cf18 ("mptcp: create the listening socket for new port")
Acked-by: default avatarGeliang Tang <geliang.tang@suse.com>
Signed-off-by: default avatarKishen Maloor <kishen.maloor@intel.com>
Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 857898eb

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;