diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2022-12-13 09:24:49 +0100 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2022-12-13 09:49:29 +0100 |
| commit | b11919e1bb7f6f6273f5a33947b8496da2769eb8 (patch) | |
| tree | f2ff877b9b0363f8fc97f1c94316f763904ec41f /net/mptcp/pm_userspace.c | |
| parent | net: lan966x: Remove a useless test in lan966x_ptp_add_trap() (diff) | |
| parent | net: dsa: tag_8021q: avoid leaking ctx on dsa_tag_8021q_register() error path (diff) | |
| download | linux-b11919e1bb7f6f6273f5a33947b8496da2769eb8.tar.xz linux-b11919e1bb7f6f6273f5a33947b8496da2769eb8.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Merge in the left-over fixes before the net-next pull-request.
net/mptcp/subflow.c
d3295fee3c75 ("mptcp: use proper req destructor for IPv6")
36b122baf6a8 ("mptcp: add subflow_v(4,6)_send_synack()")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'net/mptcp/pm_userspace.c')
| -rw-r--r-- | net/mptcp/pm_userspace.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index 5cb65f0928f4..65dcc55a8ad8 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -156,6 +156,7 @@ int mptcp_nl_cmd_announce(struct sk_buff *skb, struct genl_info *info) if (addr_val.addr.id == 0 || !(addr_val.flags & MPTCP_PM_ADDR_FLAG_SIGNAL)) { GENL_SET_ERR_MSG(info, "invalid addr id or flags"); + err = -EINVAL; goto announce_err; } @@ -282,6 +283,7 @@ int mptcp_nl_cmd_sf_create(struct sk_buff *skb, struct genl_info *info) if (addr_l.id == 0) { NL_SET_ERR_MSG_ATTR(info->extack, laddr, "missing local addr id"); + err = -EINVAL; goto create_err; } @@ -395,11 +397,13 @@ int mptcp_nl_cmd_sf_destroy(struct sk_buff *skb, struct genl_info *info) if (addr_l.family != addr_r.family) { GENL_SET_ERR_MSG(info, "address families do not match"); + err = -EINVAL; goto destroy_err; } if (!addr_l.port || !addr_r.port) { GENL_SET_ERR_MSG(info, "missing local or remote port"); + err = -EINVAL; goto destroy_err; } |