systemd/0239-resolved-fall-back-to-hardcoded-ifindex-when-checkin.patch

40 lines
1.3 KiB
Diff
Raw Normal View History

2014-10-04 02:43:52 +00:00
From d1c457badfce0dc86b54b2cac2c5eec99d7bc65e Mon Sep 17 00:00:00 2001
From: Tom Gundersen <teg@jklm.no>
Date: Sat, 13 Sep 2014 20:41:35 +0200
Subject: [PATCH] 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
---
src/resolve/resolved-manager.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c
index f97989754d..00aaffe448 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;