[systemd-commits] src/resolve

[Tom Gundersen]

 src/resolve/resolved-manager.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit d1c457badfce0dc86b54b2cac2c5eec99d7bc65e
Author: Tom Gundersen <teg at jklm.no>
Date:   Sat Sep 13 20:41:35 2014 +0200

    resolved: fall back to hardcoded ifindex when checking if a link is the loopback
    
    Reported by Philippe De Swert <philippedeswert at gmail.com>.
    
    Coverity CID#1237656

diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c
index f979897..00aaffe 100644
--- a/src/resolve/resolved-manager.c
+++ b/src/resolve/resolved-manager.c
@@ -1687,6 +1687,9 @@ fail:
         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);
@@ -1695,7 +1698,10 @@ int manager_ifindex_is_loopback(Manager *m, int 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;