Commit 64bac8ee authored by Geliang Tang's avatar Geliang Tang Committed by Geliang Tang
Browse files

mptcp: move sk assignment statement ahead 

mainline inclusion
from mainline-v6.7-rc1
commit a6c85fc61c088c7ef43ba81e80b48c263a80602a
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I9VYQ9
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=a6c85fc61c088c7ef43ba81e80b48c263a80602a



--------------------------------

If we move the sk assignment statement ahead in mptcp_nl_cmd_sf_create()
or mptcp_nl_cmd_sf_destroy(), right after the msk null-check statements,
sk can be used after the create_err or destroy_err labels instead of
open-coding it again.

Reviewed-by: default avatarMatthieu Baerts <matttbe@kernel.org>
Signed-off-by: default avatarGeliang Tang <geliang.tang@suse.com>
Signed-off-by: default avatarMat Martineau <martineau@kernel.org>
Link: https://lore.kernel.org/r/20231025-send-net-next-20231025-v1-7-db8f25f798eb@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Reviewed-by: default avatarJackie Liu <liuyun01@kylinos.cn>
Signed-off-by: default avatarGeliang Tang <tanggeliang@kylinos.cn>
parent 9dfdffa2

net/mptcp/pm_userspace.c

+6 −5
Original line number Diff line number Diff line
@@ -347,6 +347,8 @@ int mptcp_pm_nl_subflow_create_doit(struct sk_buff *skb, struct genl_info *info) 
		return err;

	}



	sk = (struct sock *)msk;



	if (!mptcp_pm_is_userspace(msk)) {

		GENL_SET_ERR_MSG(info, "invalid request; userspace PM not selected");

		goto create_err;
@@ -364,8 +366,6 @@ int mptcp_pm_nl_subflow_create_doit(struct sk_buff *skb, struct genl_info *info) 
		goto create_err;

	}



	sk = (struct sock *)msk;



	if (!mptcp_pm_addr_families_match(sk, &addr_l, &addr_r)) {

		GENL_SET_ERR_MSG(info, "families mismatch");

		err = -EINVAL;
@@ -393,7 +393,7 @@ int mptcp_pm_nl_subflow_create_doit(struct sk_buff *skb, struct genl_info *info) 
	spin_unlock_bh(&msk->pm.lock);



 create_err:

	sock_put((struct sock *)msk);

	sock_put(sk);

	return err;

}
@@ -470,6 +470,8 @@ int mptcp_pm_nl_subflow_destroy_doit(struct sk_buff *skb, struct genl_info *info 
		return err;

	}



	sk = (struct sock *)msk;



	if (!mptcp_pm_is_userspace(msk)) {

		GENL_SET_ERR_MSG(info, "invalid request; userspace PM not selected");

		goto destroy_err;
@@ -509,7 +511,6 @@ int mptcp_pm_nl_subflow_destroy_doit(struct sk_buff *skb, struct genl_info *info 
		goto destroy_err;

	}



	sk = (struct sock *)msk;

	lock_sock(sk);

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

	if (ssk) {
@@ -529,7 +530,7 @@ int mptcp_pm_nl_subflow_destroy_doit(struct sk_buff *skb, struct genl_info *info 
	release_sock(sk);



destroy_err:

	sock_put((struct sock *)msk);

	sock_put(sk);

	return err;

}