Commit 48b36539 authored by Geliang Tang's avatar Geliang Tang Committed by Geliang Tang
Browse files

mptcp: userspace pm rename remove_err to out 

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



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

The value of 'err' will not be only '-EINVAL', but can be '0' in some
cases.

So it's better to rename the label 'remove_err' to 'out' to avoid
confusions.

Suggested-by: default avatarMatthieu Baerts <matttbe@kernel.org>
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/20231128-send-net-next-2023107-v4-6-8d6b94150f6b@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 ea5ff5ad

net/mptcp/pm_userspace.c

+4 −4
Original line number Diff line number Diff line
@@ -288,12 +288,12 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info) 


	if (!mptcp_pm_is_userspace(msk)) {

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

		goto remove_err;

		goto out;

	}



	if (id_val == 0) {

		err = mptcp_userspace_pm_remove_id_zero_address(msk, info);

		goto remove_err;

		goto out;

	}



	lock_sock(sk);
@@ -308,7 +308,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(sk);

		goto remove_err;

		goto out;

	}



	list_move(&match->list, &free_list);
@@ -322,7 +322,7 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info) 
	}



	err = 0;

 remove_err:

out:

	sock_put(sk);

	return err;

}