X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=src%2Flibsystemd-bus%2Fsd-bus.c;h=1244ec2f6dd051df9d04a3e434b2e45e5f4fd7b4;hb=626851be97b4332fc0401d754c81ae7bbc0f5dc4;hp=8ffc9a9effa4f027cccdeffc4fd929b4824d67ce;hpb=32f464809e8e487739fde53a2feb0afba70c8db7;p=elogind.git

diff --git a/src/libsystemd-bus/sd-bus.c b/src/libsystemd-bus/sd-bus.c
index 8ffc9a9ef..1244ec2f6 100644
--- a/src/libsystemd-bus/sd-bus.c
+++ b/src/libsystemd-bus/sd-bus.c
@@ -181,6 +181,7 @@ _public_ int sd_bus_new(sd_bus **ret) {
         r->n_ref = REFCNT_INIT;
         r->input_fd = r->output_fd = -1;
         r->message_version = 1;
+        r->creds_mask |= SD_BUS_CREDS_WELL_KNOWN_NAMES|SD_BUS_CREDS_UNIQUE_NAME;
         r->hello_flags |= KDBUS_HELLO_ACCEPT_FD;
         r->attach_flags |= KDBUS_ATTACH_NAMES;
         r->original_pid = getpid();
@@ -290,7 +291,10 @@ _public_ int sd_bus_negotiate_attach_creds(sd_bus *bus, uint64_t mask) {
         assert_return(bus->state == BUS_UNSET, -EPERM);
         assert_return(!bus_pid_changed(bus), -ECHILD);
 
-        return kdbus_translate_attach_flags(mask, &bus->creds_mask);
+        /* The well knowns we need unconditionally, so that matches can work */
+        bus->creds_mask = mask | SD_BUS_CREDS_WELL_KNOWN_NAMES|SD_BUS_CREDS_UNIQUE_NAME;
+
+        return kdbus_translate_attach_flags(bus->creds_mask, &bus->creds_mask);
 }
 
 _public_ int sd_bus_set_server(sd_bus *bus, int b, sd_id128_t server_id) {
@@ -986,15 +990,17 @@ _public_ int sd_bus_open_system(sd_bus **ret) {
                 return r;
 
         e = secure_getenv("DBUS_SYSTEM_BUS_ADDRESS");
-        if (e) {
+        if (e)
                 r = sd_bus_set_address(b, e);
-                if (r < 0)
-                        goto fail;
-        } else {
-                b->sockaddr.un.sun_family = AF_UNIX;
-                strncpy(b->sockaddr.un.sun_path, "/run/dbus/system_bus_socket", sizeof(b->sockaddr.un.sun_path));
-                b->sockaddr_size = offsetof(struct sockaddr_un, sun_path) + sizeof("/run/dbus/system_bus_socket") - 1;
-        }
+        else
+#ifdef ENABLE_KDBUS
+                r = sd_bus_set_address(b, "kernel:path=/dev/kdbus/0-system/bus;unix:path=/run/dbus/system_bus_socket");
+#else
+                r = sd_bus_set_address(b, "unix:path=/run/dbus/system_bus_socket");
+#endif
+
+        if (r < 0)
+                goto fail;
 
         b->bus_client = true;
 
@@ -1013,7 +1019,6 @@ fail:
 _public_ int sd_bus_open_user(sd_bus **ret) {
         const char *e;
         sd_bus *b;
-        size_t l;
         int r;
 
         assert_return(ret, -EINVAL);
@@ -1029,20 +1034,32 @@ _public_ int sd_bus_open_user(sd_bus **ret) {
                         goto fail;
         } else {
                 e = secure_getenv("XDG_RUNTIME_DIR");
-                if (!e) {
-                        r = -ENOENT;
-                        goto fail;
+                if (e) {
+                        _cleanup_free_ char *ee = NULL;
+
+                        ee = bus_address_escape(e);
+                        if (!ee) {
+                                r = -ENOMEM;
+                                goto fail;
+                        }
+
+#ifdef ENABLE_KDBUS
+                        asprintf(&b->address, "kernel:path=/dev/kdbus/%lu-user/bus;unix:path=%s/bus", (unsigned long) getuid(), ee);
+#else
+                        b->address = strjoin("unix:path=", ee, "/bus", NULL);
+#endif
+                } else {
+#ifdef ENABLE_KDBUS
+                        asprintf(&b->address, "kernel:path=/dev/kdbus/%lu-user/bus", (unsigned long) getuid());
+#else
+                        return -ECONNREFUSED;
+#endif
                 }
 
-                l = strlen(e);
-                if (l + 4 > sizeof(b->sockaddr.un.sun_path)) {
-                        r = -E2BIG;
+                if (!b->address) {
+                        r = -ENOMEM;
                         goto fail;
                 }
-
-                b->sockaddr.un.sun_family = AF_UNIX;
-                memcpy(mempcpy(b->sockaddr.un.sun_path, e, l), "/bus", 4);
-                b->sockaddr_size = offsetof(struct sockaddr_un, sun_path) + l + 4;
         }
 
         b->bus_client = true;
@@ -1153,9 +1170,8 @@ _public_ void sd_bus_close(sd_bus *bus) {
 
         /* We'll leave the fd open in case this is a kernel bus, since
          * there might still be memblocks around that reference this
-         * bus, and they might need to invoke the
-         * KDBUS_CMD_MSG_RELEASE ioctl on the fd when they are
-         * freed. */
+         * bus, and they might need to invoke the * KDBUS_CMD_FREE
+         * ioctl on the fd when they are freed. */
 }
 
 static void bus_enter_closing(sd_bus *bus) {
@@ -2803,7 +2819,7 @@ _public_ int sd_bus_get_peer_creds(sd_bus *bus, uint64_t mask, sd_bus_creds **re
                 c->uid = bus->ucred.uid;
                 c->gid = bus->ucred.gid;
 
-                c->mask |= ((SD_BUS_CREDS_UID | SD_BUS_CREDS_PID | SD_BUS_CREDS_GID) & mask) & bus->creds_mask;
+                c->mask |= (SD_BUS_CREDS_UID | SD_BUS_CREDS_PID | SD_BUS_CREDS_GID) & mask;
         }
 
         if (!isempty(bus->label) && (mask & SD_BUS_CREDS_SELINUX_CONTEXT)) {
@@ -2813,7 +2829,7 @@ _public_ int sd_bus_get_peer_creds(sd_bus *bus, uint64_t mask, sd_bus_creds **re
                         return -ENOMEM;
                 }
 
-                c->mask |= SD_BUS_CREDS_SELINUX_CONTEXT | bus->creds_mask;
+                c->mask |= SD_BUS_CREDS_SELINUX_CONTEXT;
         }
 
         r = bus_creds_add_more(c, mask, pid, 0);