| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Fri, 25 Jun 2021 13:44:40 +0300
From: Alexander Mikhalitsyn <alexander.mikhalitsyn@...tuozzo.com>
To: netdev@...r.kernel.org
Cc: Alexander Mikhalitsyn <alexander.mikhalitsyn@...tuozzo.com>,
David Ahern <dsahern@...il.com>,
Stephen Hemminger <stephen@...workplumber.org>,
Andrei Vagin <avagin@...il.com>,
Alexander Mikhalitsyn <alexander@...alicyn.com>
Subject: [PATCHv3 iproute2] ip route: ignore ENOENT during save if RT_TABLE_MAIN is being dumped
We started to use in-kernel filtering feature which allows to get only needed
tables (see iproute_dump_filter()). From the kernel side it's implemented in
net/ipv4/fib_frontend.c (inet_dump_fib), net/ipv6/ip6_fib.c (inet6_dump_fib).
The problem here is that behaviour of "ip route save" was changed after
c7e6371bc ("ip route: Add protocol, table id and device to dump request").
If filters are used, then kernel returns ENOENT error if requested table is absent,
but in newly created net namespace even RT_TABLE_MAIN table doesn't exist.
It is really allocated, for instance, after issuing "ip l set lo up".
Reproducer is fairly simple:
$ unshare -n ip route save > dump
Error: ipv4: FIB table does not exist.
Dump terminated
Expected result here is to get empty dump file (as it was before this change).
v2: reworked, so, now it takes into account NLMSGERR_ATTR_MSG
(see nl_dump_ext_ack_done() function). We want to suppress error messages
in stderr about absent FIB table from kernel too.
v3: reworked to make code clearer. Introduced rtnl_suppressed_errors(),
rtnl_suppress_error() helpers. User may suppress up to 3 errors (may be
easily extened by changing SUPPRESS_ERRORS_INIT macro).
Fixes: c7e6371bc ("ip route: Add protocol, table id and device to dump request")
Cc: David Ahern <dsahern@...il.com>
Cc: Stephen Hemminger <stephen@...workplumber.org>
Cc: Andrei Vagin <avagin@...il.com>
Cc: Alexander Mikhalitsyn <alexander@...alicyn.com>
Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@...tuozzo.com>
---
include/libnetlink.h | 37 +++++++++++++++++++++++++++++++++++++
ip/iproute.c | 7 ++++++-
lib/libnetlink.c | 27 ++++++++++++++++++++++-----
3 files changed, 65 insertions(+), 6 deletions(-)
diff --git a/include/libnetlink.h b/include/libnetlink.h
index b9073a6a..c41f714a 100644
--- a/include/libnetlink.h
+++ b/include/libnetlink.h
@@ -121,6 +121,43 @@ int rtnl_dump_filter_nc(struct rtnl_handle *rth,
void *arg, __u16 nc_flags);
#define rtnl_dump_filter(rth, filter, arg) \
rtnl_dump_filter_nc(rth, filter, arg, 0)
+int rtnl_dump_filter_suppress_rtnl_errmsg_nc(struct rtnl_handle *rth,
+ rtnl_filter_t filter,
+ void *arg1, __u16 nc_flags, const int *errnos);
+#define rtnl_dump_filter_suppress_rtnl_errmsg(rth, filter, arg, errnos) \
+ rtnl_dump_filter_suppress_rtnl_errmsg_nc(rth, filter, arg, 0, errnos)
+#define SUPPRESS_ERRORS_INIT { 0, 0, 0, 0 }
+static inline int rtnl_suppressed_error(const int *errnos, int err_no)
+{
+ /* errnos is 0 terminated array or NULL */
+ while (errnos && *errnos) {
+ if (err_no == *errnos)
+ return 1;
+
+ errnos++;
+ }
+
+ return 0;
+}
+static inline void rtnl_suppress_error(int *errnos, int err_no)
+{
+ /* last 0 is trailing for errnos array */
+ int max = sizeof((int[])SUPPRESS_ERRORS_INIT) /
+ sizeof(int) - 1;
+
+ if (errnos == NULL)
+ return;
+
+ for (int i = 0; i < max; i++) {
+ if (errnos[i] == err_no)
+ break;
+
+ if (!errnos[i]) {
+ errnos[i] = err_no;
+ break;
+ }
+ }
+}
int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n,
struct nlmsghdr **answer)
__attribute__((warn_unused_result));
diff --git a/ip/iproute.c b/ip/iproute.c
index 5853f026..532ca724 100644
--- a/ip/iproute.c
+++ b/ip/iproute.c
@@ -1734,6 +1734,7 @@ static int iproute_list_flush_or_save(int argc, char **argv, int action)
char *od = NULL;
unsigned int mark = 0;
rtnl_filter_t filter_fn;
+ int suppress_rtnl_errnos[] = SUPPRESS_ERRORS_INIT;
if (action == IPROUTE_SAVE) {
if (save_route_prep())
@@ -1939,7 +1940,11 @@ static int iproute_list_flush_or_save(int argc, char **argv, int action)
new_json_obj(json);
- if (rtnl_dump_filter(&rth, filter_fn, stdout) < 0) {
+ if (filter.tb == RT_TABLE_MAIN)
+ rtnl_suppress_error(suppress_rtnl_errnos, ENOENT);
+
+ if (rtnl_dump_filter_suppress_rtnl_errmsg(&rth, filter_fn, stdout,
+ suppress_rtnl_errnos) < 0) {
fprintf(stderr, "Dump terminated\n");
return -2;
}
diff --git a/lib/libnetlink.c b/lib/libnetlink.c
index c958aa57..5c5a19bb 100644
--- a/lib/libnetlink.c
+++ b/lib/libnetlink.c
@@ -673,7 +673,7 @@ int rtnl_dump_request_n(struct rtnl_handle *rth, struct nlmsghdr *n)
return sendmsg(rth->fd, &msg, 0);
}
-static int rtnl_dump_done(struct nlmsghdr *h)
+static int rtnl_dump_done(struct nlmsghdr *h, const int *errnos)
{
int len = *(int *)NLMSG_DATA(h);
@@ -683,11 +683,15 @@ static int rtnl_dump_done(struct nlmsghdr *h)
}
if (len < 0) {
+ errno = -len;
+
+ if (rtnl_suppressed_error(errnos, errno))
+ return 0;
+
/* check for any messages returned from kernel */
if (nl_dump_ext_ack_done(h, len))
return len;
- errno = -len;
switch (errno) {
case ENOENT:
case EOPNOTSUPP:
@@ -789,7 +793,8 @@ static int rtnl_recvmsg(int fd, struct msghdr *msg, char **answer)
}
static int rtnl_dump_filter_l(struct rtnl_handle *rth,
- const struct rtnl_dump_filter_arg *arg)
+ const struct rtnl_dump_filter_arg *arg,
+ const int *errnos)
{
struct sockaddr_nl nladdr;
struct iovec iov;
@@ -834,7 +839,7 @@ static int rtnl_dump_filter_l(struct rtnl_handle *rth,
dump_intr = 1;
if (h->nlmsg_type == NLMSG_DONE) {
- err = rtnl_dump_done(h);
+ err = rtnl_dump_done(h, errnos);
if (err < 0) {
free(buf);
return -1;
@@ -891,7 +896,19 @@ int rtnl_dump_filter_nc(struct rtnl_handle *rth,
{ .filter = NULL, .arg1 = NULL, .nc_flags = 0, },
};
- return rtnl_dump_filter_l(rth, a);
+ return rtnl_dump_filter_l(rth, a, NULL);
+}
+
+int rtnl_dump_filter_suppress_rtnl_errmsg_nc(struct rtnl_handle *rth,
+ rtnl_filter_t filter,
+ void *arg1, __u16 nc_flags, const int *errnos)
+{
+ const struct rtnl_dump_filter_arg a[2] = {
+ { .filter = filter, .arg1 = arg1, .nc_flags = nc_flags, },
+ { .filter = NULL, .arg1 = NULL, .nc_flags = 0, },
+ };
+
+ return rtnl_dump_filter_l(rth, a, errnos);
}
static void rtnl_talk_error(struct nlmsghdr *h, struct nlmsgerr *err,
--
2.31.1
Powered by blists - more mailing lists