From: Andrew Vagin <avagin@openvz.org>
Date: Wed, 23 Sep 2015 11:43:46 +0000 (+0300)
Subject: route: filter routes by family if it's specified
X-Git-Tag: v4.3.0~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b9ac1902916944ae41478b408a560f7b7eb42e5;p=thirdparty%2Fiproute2.git

route: filter routes by family if it's specified

Currently when we specify AF_INET6 when it is disabled, we will get
all routes.

For example, we can boot kernel with ipv6.disable=1 and try to get ipv6
routes:
$ ip -6 route show
default via 192.168.122.1 dev eth0  proto static  metric 100
192.168.122.0/24 dev eth0  proto kernel  scope link  src 192.168.122.141  metric 100

Here are ipv4 routes and this is unexpected behaviour.

Signed-off-by: Andrew Vagin <avagin@openvz.org>
---

diff --git a/ip/iproute.c b/ip/iproute.c
index abe41803e..da25548c5 100644
--- a/ip/iproute.c
+++ b/ip/iproute.c
@@ -145,6 +145,9 @@ static int filter_nlmsg(struct nlmsghdr *n, struct rtattr **tb, int host_len)
 
 	table = rtm_get_table(r, tb);
 
+	if (preferred_family != AF_UNSPEC && r->rtm_family != preferred_family)
+		return 0;
+
 	if (r->rtm_family == AF_INET6 && table != RT_TABLE_MAIN)
 		ip6_multiple_tables = 1;