ip-route: Fix for listing routes with RTAX_LOCK attribute

This fixes a corner-case for routes with a certain metric locked to
zero:

| ip route add 192.168.7.0/24 dev eth0 window 0
| ip route add 192.168.7.0/24 dev eth0 window lock 0

Since the kernel doesn't dump the attribute if it is zero, both routes
added above would appear as if they were equal although they are not.

Fix this by taking mxlock value for the given metric into account before
skipping it if it is not present.

Reported-by: Thomas Haller <thaller@redhat.com>
Signed-off-by: Phil Sutter <phil@nwl.cc>

diff --git a/ip/iproute.c b/ip/iproute.c
index a8733f45bf881aad23bfd85bf14134c628db7313..e81bc05ec16cb2985bc8685cda8f3e60f6d6a4c2 100644 (file)
--- a/ip/iproute.c
+++ b/ip/iproute.c
@@ -574,10 +574,10 @@ int print_route(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
                for (i = 2; i <= RTAX_MAX; i++) {
                        __u32 val = 0U;
 
-                       if (mxrta[i] == NULL)
+                       if (mxrta[i] == NULL && !(mxlock & (1 << i)))
                                continue;
 
-                       if (i != RTAX_CC_ALGO)
+                       if (mxrta[i] != NULL && i != RTAX_CC_ALGO)
                                val = rta_getattr_u32(mxrta[i]);
 
                        if (i == RTAX_HOPLIMIT && (int)val == -1)