From: Kishen Maloor <kishen.maloor@intel.com>
To: kishen.maloor@intel.com, mptcp@lists.linux.dev
Subject: [PATCH mptcp-next 3/3] Squash-to: mptcp: netlink: allow userspace-driven subflow establishment
Date: Tue, 19 Apr 2022 19:03:40 -0400 [thread overview]
Message-ID: <20220419230340.2263545-4-kishen.maloor@intel.com> (raw)
In-Reply-To: <20220419230340.2263545-1-kishen.maloor@intel.com>
Signed-off-by: Kishen Maloor <kishen.maloor@intel.com>
---
net/mptcp/pm_userspace.c | 59 ++++++++++++++++++++++------------------
1 file changed, 32 insertions(+), 27 deletions(-)
diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c
index 3d8f6126b952..9f6b5eda5524 100644
--- a/net/mptcp/pm_userspace.c
+++ b/net/mptcp/pm_userspace.c
@@ -251,13 +251,13 @@ int mptcp_nl_cmd_sf_create(struct sk_buff *skb, struct genl_info *info)
struct mptcp_addr_info addr_r;
struct mptcp_addr_info addr_l;
struct mptcp_sock *msk;
+ int err = -EINVAL;
struct sock *sk;
u32 token_val;
- int ret;
if (!laddr || !raddr || !token) {
GENL_SET_ERR_MSG(info, "missing required inputs");
- return -EINVAL;
+ return err;
}
token_val = nla_get_u32(token);
@@ -265,39 +265,41 @@ int mptcp_nl_cmd_sf_create(struct sk_buff *skb, struct genl_info *info)
msk = mptcp_token_get_sock(genl_info_net(info), token_val);
if (!msk) {
NL_SET_ERR_MSG_ATTR(info->extack, token, "invalid token");
- return -EINVAL;
+ return err;
}
if (!mptcp_pm_is_userspace(msk)) {
GENL_SET_ERR_MSG(info, "invalid request; userspace PM not selected");
- return -EINVAL;
+ goto create_err;
}
- ret = mptcp_pm_parse_addr(laddr, info, &addr_l);
- if (ret < 0) {
+ err = mptcp_pm_parse_addr(laddr, info, &addr_l);
+ if (err < 0) {
NL_SET_ERR_MSG_ATTR(info->extack, laddr, "error parsing local addr");
- return -EINVAL;
+ goto create_err;
}
if (addr_l.id == 0) {
NL_SET_ERR_MSG_ATTR(info->extack, laddr, "missing local addr id");
- return -EINVAL;
+ goto create_err;
}
- ret = mptcp_pm_parse_addr(raddr, info, &addr_r);
- if (ret < 0) {
+ err = mptcp_pm_parse_addr(raddr, info, &addr_r);
+ if (err < 0) {
NL_SET_ERR_MSG_ATTR(info->extack, raddr, "error parsing remote addr");
- return -EINVAL;
+ goto create_err;
}
sk = &msk->sk.icsk_inet.sk;
lock_sock(sk);
- ret = __mptcp_subflow_connect(sk, &addr_l, &addr_r);
+ err = __mptcp_subflow_connect(sk, &addr_l, &addr_r);
release_sock(sk);
- return ret;
+ create_err:
+ sock_put((struct sock *)msk);
+ return err;
}
static struct sock *mptcp_nl_find_ssk(struct mptcp_sock *msk,
@@ -366,12 +368,12 @@ int mptcp_nl_cmd_sf_destroy(struct sk_buff *skb, struct genl_info *info)
struct mptcp_addr_info addr_r;
struct mptcp_sock *msk;
struct sock *sk, *ssk;
+ int err = -EINVAL;
u32 token_val;
- int ret;
if (!laddr || !raddr || !token) {
GENL_SET_ERR_MSG(info, "missing required inputs");
- return -EINVAL;
+ return err;
}
token_val = nla_get_u32(token);
@@ -379,34 +381,34 @@ int mptcp_nl_cmd_sf_destroy(struct sk_buff *skb, struct genl_info *info)
msk = mptcp_token_get_sock(genl_info_net(info), token_val);
if (!msk) {
NL_SET_ERR_MSG_ATTR(info->extack, token, "invalid token");
- return -EINVAL;
+ return err;
}
if (!mptcp_pm_is_userspace(msk)) {
GENL_SET_ERR_MSG(info, "invalid request; userspace PM not selected");
- return -EINVAL;
+ goto destroy_err;
}
- ret = mptcp_pm_parse_addr(laddr, info, &addr_l);
- if (ret < 0) {
+ err = mptcp_pm_parse_addr(laddr, info, &addr_l);
+ if (err < 0) {
NL_SET_ERR_MSG_ATTR(info->extack, laddr, "error parsing local addr");
- return ret;
+ goto destroy_err;
}
- ret = mptcp_pm_parse_addr(raddr, info, &addr_r);
- if (ret < 0) {
+ err = mptcp_pm_parse_addr(raddr, info, &addr_r);
+ if (err < 0) {
NL_SET_ERR_MSG_ATTR(info->extack, raddr, "error parsing remote addr");
- return ret;
+ goto destroy_err;
}
if (addr_l.family != addr_r.family) {
GENL_SET_ERR_MSG(info, "address families do not match");
- return -EINVAL;
+ goto destroy_err;
}
if (!addr_l.port || !addr_r.port) {
GENL_SET_ERR_MSG(info, "missing local or remote port");
- return -EINVAL;
+ goto destroy_err;
}
sk = &msk->sk.icsk_inet.sk;
@@ -416,9 +418,12 @@ int mptcp_nl_cmd_sf_destroy(struct sk_buff *skb, struct genl_info *info)
mptcp_subflow_shutdown(sk, ssk, RCV_SHUTDOWN | SEND_SHUTDOWN);
mptcp_close_ssk(sk, ssk, subflow);
+ err = 0;
} else {
- ret = -ESRCH;
+ err = -ESRCH;
}
- return ret;
+ destroy_err:
+ sock_put((struct sock *)msk);
+ return err;
}
--
2.31.1
next prev parent reply other threads:[~2022-04-19 23:03 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-19 23:03 [PATCH mptcp-next 0/3] mptcp: fix bug in userspace PM APIs Kishen Maloor
2022-04-19 23:03 ` [PATCH mptcp-next 1/3] Squash-to: mptcp: netlink: Add MPTCP_PM_CMD_ANNOUNCE Kishen Maloor
2022-04-20 1:04 ` Geliang Tang
2022-04-19 23:03 ` [PATCH mptcp-next 2/3] Squash-to: mptcp: netlink: Add MPTCP_PM_CMD_REMOVE Kishen Maloor
2022-04-19 23:03 ` Kishen Maloor [this message]
2022-04-20 1:02 ` Squash-to: mptcp: netlink: allow userspace-driven subflow establishment: Tests Results MPTCP CI
2022-04-19 23:22 ` [PATCH mptcp-next 0/3] mptcp: fix bug in userspace PM APIs Mat Martineau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220419230340.2263545-4-kishen.maloor@intel.com \
--to=kishen.maloor@intel.com \
--cc=mptcp@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox