resolved: fall back to hardcoded ifindex when checking if a link is the loopback

Reported by Philippe De Swert <philippedeswert@gmail.com>.

Coverity CID#1237656

diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c
index f97989754d5594a087cf89e6595e7664ab341fd3..00aaffe44899bdcf9efb01372ee03c2ac47ac603 100644 (file)
--- a/src/resolve/resolved-manager.c
+++ b/src/resolve/resolved-manager.c
@@ -1687,6 +1687,9 @@ fail:
         return r;
 }
 
         return r;
 }
 

+/* lo having ifindex 1 is hardcoded in the kernel */
+#define LOOPBACK_IFINDEX 1
+

 int manager_ifindex_is_loopback(Manager *m, int ifindex) {
         Link *l;
         assert(m);
 int manager_ifindex_is_loopback(Manager *m, int ifindex) {
         Link *l;
         assert(m);


@@ -1695,7 +1698,10 @@ int manager_ifindex_is_loopback(Manager *m, int ifindex) {
                 return -EINVAL;
 
         l = hashmap_get(m->links, INT_TO_PTR(ifindex));
                 return -EINVAL;
 
         l = hashmap_get(m->links, INT_TO_PTR(ifindex));

-        if (l->flags & IFF_LOOPBACK)
+        if (!l)
+                /* in case we don't yet track the link, rely on the hardcoded value */
+                return ifindex == LOOPBACK_IFINDEX;
+        else if (l->flags & IFF_LOOPBACK)

                 return 1;
 
         return 0;
                 return 1;
 
         return 0;