Commit 0374ab79 authored by Geliang Tang's avatar Geliang Tang Committed by Geliang Tang
Browse files

mptcp: define more local variables sk 

mainline inclusion
from mainline-v6.7-rc1
commit 14cb0e0bf39bd10429ba14e9e2f905f1144226fc
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=14cb0e0bf39bd10429ba14e9e2f905f1144226fc



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

'(struct sock *)msk' is used several times in mptcp_nl_cmd_announce(),
mptcp_nl_cmd_remove() or mptcp_userspace_pm_set_flags() in pm_userspace.c,
it's worth adding a local variable sk to point it.

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-8-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 64bac8ee

net/mptcp/pm_userspace.c

+20 −11
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ int mptcp_pm_nl_announce_doit(struct sk_buff *skb, struct genl_info *info) 
	struct mptcp_pm_addr_entry addr_val;

	struct mptcp_sock *msk;

	int err = -EINVAL;

	struct sock *sk;

	u32 token_val;



	if (!addr || !token) {
@@ -179,6 +180,8 @@ int mptcp_pm_nl_announce_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 announce_err;
@@ -202,7 +205,7 @@ int mptcp_pm_nl_announce_doit(struct sk_buff *skb, struct genl_info *info) 
		goto announce_err;

	}



	lock_sock((struct sock *)msk);

	lock_sock(sk);

	spin_lock_bh(&msk->pm.lock);



	if (mptcp_pm_alloc_anno_list(msk, &addr_val.addr)) {
@@ -212,11 +215,11 @@ int mptcp_pm_nl_announce_doit(struct sk_buff *skb, struct genl_info *info) 
	}



	spin_unlock_bh(&msk->pm.lock);

	release_sock((struct sock *)msk);

	release_sock(sk);



	err = 0;

 announce_err:

	sock_put((struct sock *)msk);

	sock_put(sk);

	return err;

}
@@ -263,6 +266,7 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info) 
	struct mptcp_sock *msk;

	LIST_HEAD(free_list);

	int err = -EINVAL;

	struct sock *sk;

	u32 token_val;

	u8 id_val;
@@ -280,6 +284,8 @@ int mptcp_pm_nl_remove_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 remove_err;
@@ -290,7 +296,7 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info) 
		goto remove_err;

	}



	lock_sock((struct sock *)msk);

	lock_sock(sk);



	list_for_each_entry(entry, &msk->pm.userspace_pm_local_addr_list, list) {

		if (entry->addr.id == id_val) {
@@ -301,7 +307,7 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info) 


	if (!match) {

		GENL_SET_ERR_MSG(info, "address with specified id not found");

		release_sock((struct sock *)msk);

		release_sock(sk);

		goto remove_err;

	}
@@ -309,15 +315,15 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info) 


	mptcp_pm_remove_addrs(msk, &free_list);



	release_sock((struct sock *)msk);

	release_sock(sk);



	list_for_each_entry_safe(match, entry, &free_list, list) {

		sock_kfree_s((struct sock *)msk, match, sizeof(*match));

		sock_kfree_s(sk, match, sizeof(*match));

	}



	err = 0;

 remove_err:

	sock_put((struct sock *)msk);

	sock_put(sk);

	return err;

}
@@ -540,6 +546,7 @@ int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token, 
{

	struct mptcp_sock *msk;

	int ret = -EINVAL;

	struct sock *sk;

	u32 token_val;



	token_val = nla_get_u32(token);
@@ -548,6 +555,8 @@ int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token, 
	if (!msk)

		return ret;



	sk = (struct sock *)msk;



	if (!mptcp_pm_is_userspace(msk))

		goto set_flags_err;
@@ -555,11 +564,11 @@ int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token, 
	    rem->addr.family == AF_UNSPEC)

		goto set_flags_err;



	lock_sock((struct sock *)msk);

	lock_sock(sk);

	ret = mptcp_pm_nl_mp_prio_send_ack(msk, &loc->addr, &rem->addr, bkup);

	release_sock((struct sock *)msk);

	release_sock(sk);



set_flags_err:

	sock_put((struct sock *)msk);

	sock_put(sk);

	return ret;

}