Skip to content

Commit 655d4a1

Browse files
matttbeintel-lab-lkp
authored andcommitted
mptcp: pm: improve error messages
Some error messages were: - too generic: "missing input", "invalid request" - not precise enough: "limit greater than maximum" but what's the max? - missing: subflow not found, or connect error. This can be easily improved by being more precise, or adding new error messages. Signed-off-by: Matthieu Baerts (NGI0) <[email protected]>
1 parent d348bf5 commit 655d4a1

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

net/mptcp/pm_netlink.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1878,8 +1878,9 @@ static int parse_limit(struct genl_info *info, int id, unsigned int *limit)
18781878

18791879
*limit = nla_get_u32(attr);
18801880
if (*limit > MPTCP_PM_ADDR_MAX) {
1881-
NL_SET_ERR_MSG_ATTR(info->extack, attr,
1882-
"limit greater than maximum");
1881+
NL_SET_ERR_MSG_ATTR_FMT(info->extack, attr,
1882+
"limit greater than maximum (%u)",
1883+
MPTCP_PM_ADDR_MAX);
18831884
return -EINVAL;
18841885
}
18851886
return 0;

net/mptcp/pm_userspace.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ static struct mptcp_sock *mptcp_userspace_pm_get_sock(const struct genl_info *in
191191

192192
if (!mptcp_pm_is_userspace(msk)) {
193193
NL_SET_ERR_MSG_ATTR(info->extack, token,
194-
"invalid request; userspace PM not selected");
194+
"userspace PM not selected");
195195
sock_put((struct sock *)msk);
196196
return NULL;
197197
}
@@ -430,6 +430,8 @@ int mptcp_pm_nl_subflow_create_doit(struct sk_buff *skb, struct genl_info *info)
430430
lock_sock(sk);
431431
err = __mptcp_subflow_connect(sk, &local, &addr_r);
432432
release_sock(sk);
433+
if (err)
434+
GENL_SET_ERR_MSG_FMT(info, "connect error: %d", err);
433435

434436
spin_lock_bh(&msk->pm.lock);
435437
if (err)
@@ -555,6 +557,7 @@ int mptcp_pm_nl_subflow_destroy_doit(struct sk_buff *skb, struct genl_info *info
555557
lock_sock(sk);
556558
ssk = mptcp_nl_find_ssk(msk, &addr_l.addr, &addr_r);
557559
if (!ssk) {
560+
GENL_SET_ERR_MSG(info, "subflow not found");
558561
err = -ESRCH;
559562
goto release_sock;
560563
}
@@ -613,6 +616,8 @@ int mptcp_userspace_pm_set_flags(struct mptcp_pm_addr_entry *local,
613616
lock_sock(sk);
614617
ret = mptcp_pm_nl_mp_prio_send_ack(msk, &entry->addr, remote, bkup);
615618
release_sock(sk);
619+
if (ret)
620+
GENL_SET_ERR_MSG(info, "mp_prio send ack failed");
616621

617622
set_flags_err:
618623
sock_put(sk);

0 commit comments

Comments
 (0)