From: Florian Westphal <fw@strlen.de>
To: <netdev@vger.kernel.org>
Cc: dsahern@gmail.com, Florian Westphal <fw@strlen.de>
Subject: [PATCH iproute2 v3] libgenl: make genl_add_mcast_grp set errno on error
Date: Mon, 17 May 2021 07:10:10 +0200 [thread overview]
Message-ID: <20210517051010.1355-1-fw@strlen.de> (raw)
genl_add_mcast_grp doesn't set errno in all cases.
On kernels that support mptcp but lack event support (all kernels <= 5.11)
MPTCP_PM_EV_GRP_NAME won't be found and ip will exit with
"can't subscribe to mptcp events: Success"
Set errno to a meaningful value (ENOENT) when the group name isn't found
and also cover other spots where it returns nonzero with errno unset.
Fixes: ff619e4fd370 ("mptcp: add support for event monitoring")
Signed-off-by: Florian Westphal <fw@strlen.de>
---
Change since v2: include errno.h
Change since v1: fix libgenl instead of setting errno in the caller.
lib/libgenl.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/lib/libgenl.c b/lib/libgenl.c
index 4c51d47af46b..fca07f9fe768 100644
--- a/lib/libgenl.c
+++ b/lib/libgenl.c
@@ -3,6 +3,7 @@
* libgenl.c GENL library
*/
+#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@@ -84,6 +85,7 @@ static int genl_parse_grps(struct rtattr *attr, const char *name, unsigned int *
}
}
+ errno = ENOENT;
return -1;
}
@@ -108,17 +110,22 @@ int genl_add_mcast_grp(struct rtnl_handle *grth, __u16 fnum, const char *group)
ghdr = NLMSG_DATA(answer);
len = answer->nlmsg_len;
- if (answer->nlmsg_type != GENL_ID_CTRL)
+ if (answer->nlmsg_type != GENL_ID_CTRL) {
+ errno = EINVAL;
goto err_free;
+ }
len -= NLMSG_LENGTH(GENL_HDRLEN);
- if (len < 0)
+ if (len < 0) {
+ errno = EINVAL;
goto err_free;
+ }
attrs = (struct rtattr *) ((char *) ghdr + GENL_HDRLEN);
parse_rtattr(tb, CTRL_ATTR_MAX, attrs, len);
if (tb[CTRL_ATTR_MCAST_GROUPS] == NULL) {
+ errno = ENOENT;
fprintf(stderr, "Missing mcast groups TLV\n");
goto err_free;
}
--
2.26.3
next reply other threads:[~2021-05-17 5:10 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-17 5:10 Florian Westphal [this message]
2021-05-17 14:44 ` [PATCH iproute2 v3] libgenl: make genl_add_mcast_grp set errno on error David Ahern
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=20210517051010.1355-1-fw@strlen.de \
--to=fw@strlen.de \
--cc=dsahern@gmail.com \
--cc=netdev@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.