From: Mantas Mikulėnas <grawity@gmail.com>
Date: Fri, 6 Feb 2015 20:35:14 +0000 (+0200)
Subject: networkd: use valid bus paths
X-Git-Tag: v219~118
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=02f500532e4823584aae43cbe762914b4a0c0254;hp=b8719ebb57961f93a9aeeb49f0b9ba1f2bab7068

networkd: use valid bus paths

Object path components must start with [A-Za-z_] (AFAIK).
Also the value of 'p' is undefined if asprintf fails.
Compare to user_bus_path() in src/login/logind-user-dbus.c:281.
---

diff --git a/src/network/networkd-link-bus.c b/src/network/networkd-link-bus.c
index f7eae87ed..7c4f47305 100644
--- a/src/network/networkd-link-bus.c
+++ b/src/network/networkd-link-bus.c
@@ -43,7 +43,8 @@ static char *link_bus_path(Link *link) {
         assert(link);
         assert(link->ifindex > 0);
 
-        asprintf(&p, "/org/freedesktop/network1/link/%d", link->ifindex);
+        if (asprintf(&p, "/org/freedesktop/network1/link/_%d", link->ifindex) < 0)
+                return NULL;
 
         return p;
 }
@@ -89,7 +90,7 @@ int link_object_find(sd_bus *bus, const char *path, const char *interface, void
         assert(m);
         assert(found);
 
-        if (sscanf(path, "/org/freedesktop/network1/link/%d", &ifindex) != 1)
+        if (sscanf(path, "/org/freedesktop/network1/link/_%d", &ifindex) != 1)
                 return 0;
 
         r = link_get(m, ifindex, &link);