diff options
author | Mantas Mikulėnas <grawity@gmail.com> | 2015-02-06 21:35:14 +0100 |
---|---|---|
committer | Tom Gundersen <teg@jklm.no> | 2015-02-08 16:34:27 +0100 |
commit | 02f500532e4823584aae43cbe762914b4a0c0254 (patch) | |
tree | 765929367ab599abbc639361698923bdadc7a5d6 /src/network/networkd-link-bus.c | |
parent | sd-rtnl: don't treat 0-length messages specially (diff) | |
download | systemd-02f500532e4823584aae43cbe762914b4a0c0254.tar.xz systemd-02f500532e4823584aae43cbe762914b4a0c0254.zip |
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.
Diffstat (limited to 'src/network/networkd-link-bus.c')
-rw-r--r-- | src/network/networkd-link-bus.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/network/networkd-link-bus.c b/src/network/networkd-link-bus.c index f7eae87edd..7c4f47305b 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); |