Commit 564c91f7 authored Jun 21, 2019 by Stefano Brivio Committed by David S. Miller Jun 24, 2019

fib_frontend, ip6_fib: Select routes or exceptions dump from RTM_F_CLONED



The following patches add back the ability to dump IPv4 and IPv6 exception
routes, and we need to allow selection of regular routes or exceptions.

Use RTM_F_CLONED as filter to decide whether to dump routes or exceptions:
iproute2 passes it in dump requests (except for IPv6 cache flush requests,
this will be fixed in iproute2) and this used to work as long as
exceptions were stored directly in the FIB, for both IPv4 and IPv6.

Caveat: if strict checking is not requested (that is, if the dump request
doesn't go through ip_valid_fib_dump_req()), we can't filter on protocol,
tables or route types.

In this case, filtering on RTM_F_CLONED would be inconsistent: we would
fix 'ip route list cache' by returning exception routes and at the same
time introduce another bug in case another selector is present, e.g. on
'ip route list cache table main' we would return all exception routes,
without filtering on tables.

Keep this consistent by applying no filters at all, and dumping both
routes and exceptions, if strict checking is not requested. iproute2
currently filters results anyway, and no unwanted results will be
presented to the user. The kernel will just dump more data than needed.

v7: No changes

v6: Rebase onto net-next, no changes

v5: New patch: add dump_routes and dump_exceptions flags in filter and
    simply clear the unwanted one if strict checking is enabled, don't
    ignore NLM_F_MATCH and don't set filter_set if NLM_F_MATCH is set.
    Skip filtering altogether if no strict checking is requested:
    selecting routes or exceptions only would be inconsistent with the
    fact we can't filter on tables.

Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Reviewed-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 97236cda

include/net/ip_fib.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -245,6 +245,8 @@ struct fib_dump_filter {
		/* filter_set is an optimization that an entry is set */
		bool filter_set;
		bool dump_all_families;
		bool dump_routes;
		bool dump_exceptions;
		unsigned char protocol;
		unsigned char rt_type;
		unsigned int flags;

net/ipv4/fib_frontend.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -912,10 +912,15 @@ int ip_valid_fib_dump_req(struct net net, const struct nlmsghdr nlh,
		NL_SET_ERR_MSG(extack, "Invalid values in header for FIB dump request");
		return -EINVAL;
		}

		if (rtm->rtm_flags & ~(RTM_F_CLONED \| RTM_F_PREFIX)) {
		NL_SET_ERR_MSG(extack, "Invalid flags for FIB dump request");
		return -EINVAL;
		}
		if (rtm->rtm_flags & RTM_F_CLONED)
		filter->dump_routes = false;
		else
		filter->dump_exceptions = false;

		filter->dump_all_families = (rtm->rtm_family == AF_UNSPEC);
		filter->flags = rtm->rtm_flags;
		@@ -962,9 +967,10 @@ EXPORT_SYMBOL_GPL(ip_valid_fib_dump_req);

		static int inet_dump_fib(struct sk_buff skb, struct netlink_callback cb)
		{
		struct fib_dump_filter filter = { .dump_routes = true,
		.dump_exceptions = true };
		const struct nlmsghdr *nlh = cb->nlh;
		struct net *net = sock_net(skb->sk);
		struct fib_dump_filter filter = {};
		unsigned int h, s_h;
		unsigned int e = 0, s_e;
		struct fib_table *tb;

net/ipv6/ip6_fib.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -553,9 +553,10 @@ static int fib6_dump_table(struct fib6_table table, struct sk_buff skb,

		static int inet6_dump_fib(struct sk_buff skb, struct netlink_callback cb)
		{
		struct rt6_rtnl_dump_arg arg = { .filter.dump_exceptions = true,
		.filter.dump_routes = true };
		const struct nlmsghdr *nlh = cb->nlh;
		struct net *net = sock_net(skb->sk);
		struct rt6_rtnl_dump_arg arg = {};
		unsigned int h, s_h;
		unsigned int e = 0, s_e;
		struct fib6_walker *w;

Admin message