Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae677bbb authored by David Ahern's avatar David Ahern Committed by David S. Miller
Browse files

net: Don't return invalid table id error when dumping all families 



When doing a route dump across all address families, do not error out
if the table does not exist. This allows a route dump for AF_UNSPEC
with a table id that may only exist for some of the families.

Do return the table does not exist error if dumping routes for a
specific family and the table does not exist.

Signed-off-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 242afaa6

include/net/ip_fib.h

+1 −0
Original line number Diff line number Diff line
@@ -226,6 +226,7 @@ struct fib_dump_filter { 
	u32			table_id;

	/* filter_set is an optimization that an entry is set */

	bool			filter_set;

	bool			dump_all_families;

	unsigned char		protocol;

	unsigned char		rt_type;

	unsigned int		flags;

net/ipv4/fib_frontend.c

+4 −0
Original line number Diff line number Diff line
@@ -829,6 +829,7 @@ int ip_valid_fib_dump_req(struct net *net, const struct nlmsghdr *nlh, 
		return -EINVAL;

	}



	filter->dump_all_families = (rtm->rtm_family == AF_UNSPEC);

	filter->flags    = rtm->rtm_flags;

	filter->protocol = rtm->rtm_protocol;

	filter->rt_type  = rtm->rtm_type;
@@ -899,6 +900,9 @@ static int inet_dump_fib(struct sk_buff *skb, struct netlink_callback *cb) 
	if (filter.table_id) {

		tb = fib_get_table(net, filter.table_id);

		if (!tb) {

			if (filter.dump_all_families)

				return skb->len;



			NL_SET_ERR_MSG(cb->extack, "ipv4: FIB table does not exist");

			return -ENOENT;

		}

net/ipv4/ipmr.c

+3 −0
Original line number Diff line number Diff line
@@ -2542,6 +2542,9 @@ static int ipmr_rtm_dumproute(struct sk_buff *skb, struct netlink_callback *cb) 


		mrt = ipmr_get_table(sock_net(skb->sk), filter.table_id);

		if (!mrt) {

			if (filter.dump_all_families)

				return skb->len;



			NL_SET_ERR_MSG(cb->extack, "ipv4: MR table does not exist");

			return -ENOENT;

		}

net/ipv6/ip6_fib.c

+3 −0
Original line number Diff line number Diff line
@@ -620,6 +620,9 @@ static int inet6_dump_fib(struct sk_buff *skb, struct netlink_callback *cb) 
	if (arg.filter.table_id) {

		tb = fib6_get_table(net, arg.filter.table_id);

		if (!tb) {

			if (arg.filter.dump_all_families)

				return skb->len;



			NL_SET_ERR_MSG_MOD(cb->extack, "FIB table does not exist");

			return -ENOENT;

		}

net/ipv6/ip6mr.c

+3 −0
Original line number Diff line number Diff line
@@ -2473,6 +2473,9 @@ static int ip6mr_rtm_dumproute(struct sk_buff *skb, struct netlink_callback *cb) 


		mrt = ip6mr_get_table(sock_net(skb->sk), filter.table_id);

		if (!mrt) {

			if (filter.dump_all_families)

				return skb->len;



			NL_SET_ERR_MSG_MOD(cb->extack, "MR table does not exist");

			return -ENOENT;

		}