bianbu-repo-mirror/bianbu-linux-6.6
1
0
Fork 0
mirror of https://gitee.com/bianbu-linux/linux-6.6 synced 2025-04-24 14:07:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

mptcp: define more local variables sk

Browse source 
commit 14cb0e0bf39bd10429ba14e9e2f905f1144226fc upstream.

'(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: Matthieu Baerts <matttbe@kernel.org>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <martineau@kernel.org>
Link: https://lore.kernel.org/r/20231025-send-net-next-20231025-v1-8-db8f25f798eb@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Stable-dep-of: 06afe09091ee ("mptcp: add userspace_pm_lookup_addr_by_id helper")
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Geliang Tang 2024-11-18 19:27:19 +01:00 • committed by Greg Kroah-Hartman
parent fb79d68a36
commit 762ca2d2e3
1 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

31
net/mptcp/pm_userspace.c
View file

@ -183,6 +183,7 @@ int mptcp_nl_cmd_announce(struct sk_buff *skb, struct genl_info *info)
struct mptcp_pm_addr_entry addr_val; struct mptcp_pm_addr_entry addr_val;
struct mptcp_sock *msk; struct mptcp_sock *msk;
int err = -EINVAL; int err = -EINVAL;
struct sock *sk;
u32 token_val; u32 token_val;
if (!addr || !token) { if (!addr || !token) {
@ -198,6 +199,8 @@ int mptcp_nl_cmd_announce(struct sk_buff *skb, struct genl_info *info)
return err; return err;
} }
sk = (struct sock *)msk;
if (!mptcp_pm_is_userspace(msk)) { if (!mptcp_pm_is_userspace(msk)) {
GENL_SET_ERR_MSG(info, "invalid request; userspace PM not selected"); GENL_SET_ERR_MSG(info, "invalid request; userspace PM not selected");
goto announce_err; goto announce_err;
@ -221,7 +224,7 @@ int mptcp_nl_cmd_announce(struct sk_buff *skb, struct genl_info *info)
goto announce_err; goto announce_err;
} }
lock_sock((struct sock *)msk); lock_sock(sk);
spin_lock_bh(&msk->pm.lock); spin_lock_bh(&msk->pm.lock);
if (mptcp_pm_alloc_anno_list(msk, &addr_val.addr)) { if (mptcp_pm_alloc_anno_list(msk, &addr_val.addr)) {
@ -231,11 +234,11 @@ int mptcp_nl_cmd_announce(struct sk_buff *skb, struct genl_info *info)
} }
spin_unlock_bh(&msk->pm.lock); spin_unlock_bh(&msk->pm.lock);
release_sock((struct sock *)msk); release_sock(sk);
err = 0; err = 0;
announce_err: announce_err:
sock_put((struct sock *)msk); sock_put(sk);
return err; return err;
} }
@ -282,6 +285,7 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct genl_info *info)
struct mptcp_sock *msk; struct mptcp_sock *msk;
LIST_HEAD(free_list); LIST_HEAD(free_list);
int err = -EINVAL; int err = -EINVAL;
struct sock *sk;
u32 token_val; u32 token_val;
u8 id_val; u8 id_val;
@ -299,6 +303,8 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct genl_info *info)
return err; return err;
} }
sk = (struct sock *)msk;
if (!mptcp_pm_is_userspace(msk)) { if (!mptcp_pm_is_userspace(msk)) {
GENL_SET_ERR_MSG(info, "invalid request; userspace PM not selected"); GENL_SET_ERR_MSG(info, "invalid request; userspace PM not selected");
goto remove_err; goto remove_err;
@ -309,7 +315,7 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct genl_info *info)
goto remove_err; goto remove_err;
} }
lock_sock((struct sock *)msk); lock_sock(sk);
list_for_each_entry(entry, &msk->pm.userspace_pm_local_addr_list, list) { list_for_each_entry(entry, &msk->pm.userspace_pm_local_addr_list, list) {
if (entry->addr.id == id_val) { if (entry->addr.id == id_val) {
@ -320,7 +326,7 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct genl_info *info)
if (!match) { if (!match) {
GENL_SET_ERR_MSG(info, "address with specified id not found"); GENL_SET_ERR_MSG(info, "address with specified id not found");
release_sock((struct sock *)msk); release_sock(sk);
goto remove_err; goto remove_err;
} }
@ -328,15 +334,15 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct genl_info *info)
mptcp_pm_remove_addrs(msk, &free_list); 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) { 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; err = 0;
remove_err: remove_err:
sock_put((struct sock *)msk); sock_put(sk);
return err; return err;
} }
@ -558,6 +564,7 @@ int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token,
{ {
struct mptcp_sock *msk; struct mptcp_sock *msk;
int ret = -EINVAL; int ret = -EINVAL;
struct sock *sk;
u32 token_val; u32 token_val;
token_val = nla_get_u32(token); token_val = nla_get_u32(token);
@ -566,6 +573,8 @@ int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token,
if (!msk) if (!msk)
return ret; return ret;
sk = (struct sock *)msk;
if (!mptcp_pm_is_userspace(msk)) if (!mptcp_pm_is_userspace(msk))
goto set_flags_err; goto set_flags_err;
@ -573,11 +582,11 @@ int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token,
rem->addr.family == AF_UNSPEC) rem->addr.family == AF_UNSPEC)
goto set_flags_err; 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); 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: set_flags_err:
sock_put((struct sock *)msk); sock_put(sk);
return ret; return ret;
} }