Commit 1c670b39 authored by Geliang Tang's avatar Geliang Tang Committed by Jakub Kicinski
Browse files

mptcp: change local addr type of subflow_destroy 



Generally, in the path manager interfaces, the local address is defined as
an mptcp_pm_addr_entry type address, while the remote address is defined as
an mptcp_addr_info type one:

        (struct mptcp_pm_addr_entry *local, struct mptcp_addr_info *remote)

But subflow_destroy() interface uses two mptcp_addr_info type parameters.
This patch changes the first one to mptcp_pm_addr_entry type and use helper
mptcp_pm_parse_entry() to parse it instead of using mptcp_pm_parse_addr().

This patch doesn't change the behaviour of the code, just refactoring.

Signed-off-by: default avatarGeliang Tang <tanggeliang@kylinos.cn>
Reviewed-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20241213-net-next-mptcp-pm-misc-cleanup-v1-6-ddb6d00109a8@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 88d09731

net/mptcp/pm_userspace.c

+11 −12
Original line number Diff line number Diff line
@@ -485,7 +485,7 @@ int mptcp_pm_nl_subflow_destroy_doit(struct sk_buff *skb, struct genl_info *info 
{

	struct nlattr *raddr = info->attrs[MPTCP_PM_ATTR_ADDR_REMOTE];

	struct nlattr *laddr = info->attrs[MPTCP_PM_ATTR_ADDR];

	struct mptcp_addr_info addr_l;

	struct mptcp_pm_addr_entry addr_l;

	struct mptcp_addr_info addr_r;

	struct mptcp_sock *msk;

	struct sock *sk, *ssk;
@@ -502,7 +502,7 @@ int mptcp_pm_nl_subflow_destroy_doit(struct sk_buff *skb, struct genl_info *info 


	sk = (struct sock *)msk;



	err = mptcp_pm_parse_addr(laddr, info, &addr_l);

	err = mptcp_pm_parse_entry(laddr, info, true, &addr_l);

	if (err < 0) {

		NL_SET_ERR_MSG_ATTR(info->extack, laddr, "error parsing local addr");

		goto destroy_err;
@@ -515,35 +515,34 @@ int mptcp_pm_nl_subflow_destroy_doit(struct sk_buff *skb, struct genl_info *info 
	}



#if IS_ENABLED(CONFIG_MPTCP_IPV6)

	if (addr_l.family == AF_INET && ipv6_addr_v4mapped(&addr_r.addr6)) {

		ipv6_addr_set_v4mapped(addr_l.addr.s_addr, &addr_l.addr6);

		addr_l.family = AF_INET6;

	if (addr_l.addr.family == AF_INET && ipv6_addr_v4mapped(&addr_r.addr6)) {

		ipv6_addr_set_v4mapped(addr_l.addr.addr.s_addr, &addr_l.addr.addr6);

		addr_l.addr.family = AF_INET6;

	}

	if (addr_r.family == AF_INET && ipv6_addr_v4mapped(&addr_l.addr6)) {

		ipv6_addr_set_v4mapped(addr_r.addr.s_addr, &addr_r.addr6);

	if (addr_r.family == AF_INET && ipv6_addr_v4mapped(&addr_l.addr.addr6)) {

		ipv6_addr_set_v4mapped(addr_r.addr.s_addr, &addr_l.addr.addr6);

		addr_r.family = AF_INET6;

	}

#endif

	if (addr_l.family != addr_r.family) {

	if (addr_l.addr.family != addr_r.family) {

		GENL_SET_ERR_MSG(info, "address families do not match");

		err = -EINVAL;

		goto destroy_err;

	}



	if (!addr_l.port || !addr_r.port) {

	if (!addr_l.addr.port || !addr_r.port) {

		GENL_SET_ERR_MSG(info, "missing local or remote port");

		err = -EINVAL;

		goto destroy_err;

	}



	lock_sock(sk);

	ssk = mptcp_nl_find_ssk(msk, &addr_l, &addr_r);

	ssk = mptcp_nl_find_ssk(msk, &addr_l.addr, &addr_r);

	if (ssk) {

		struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(ssk);

		struct mptcp_pm_addr_entry entry = { .addr = addr_l };



		spin_lock_bh(&msk->pm.lock);

		mptcp_userspace_pm_delete_local_addr(msk, &entry);

		mptcp_userspace_pm_delete_local_addr(msk, &addr_l);

		spin_unlock_bh(&msk->pm.lock);

		mptcp_subflow_shutdown(sk, ssk, RCV_SHUTDOWN | SEND_SHUTDOWN);

		mptcp_close_ssk(sk, ssk, subflow);