X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flibsystemd%2Fsd-bus%2Fbus-control.c;h=96f59f9b36cf5a0045165584b6bc9f42b60399e4;hp=846307d6647d1f23d94804efba66b5f067103d96;hb=056f95d0a70413e10e4a4ea9966baabb5a1450ed;hpb=b28ff39f42877daef31383748fd2f313d7fd67c1 diff --git a/src/libsystemd/sd-bus/bus-control.c b/src/libsystemd/sd-bus/bus-control.c index 846307d66..96f59f9b3 100644 --- a/src/libsystemd/sd-bus/bus-control.c +++ b/src/libsystemd/sd-bus/bus-control.c @@ -58,12 +58,15 @@ static int bus_request_name_kernel(sd_bus *bus, const char *name, uint64_t flags assert(bus); assert(name); - l = strlen(name); - size = offsetof(struct kdbus_cmd_name, name) + l + 1; - n = alloca0(size); + l = strlen(name) + 1; + size = offsetof(struct kdbus_cmd_name, items) + KDBUS_ITEM_SIZE(l); + n = alloca0_align(size, 8); n->size = size; kdbus_translate_request_name_flags(flags, (uint64_t *) &n->flags); - memcpy(n->name, name, l+1); + + n->items[0].size = KDBUS_ITEM_HEADER_SIZE + l; + n->items[0].type = KDBUS_ITEM_NAME; + memcpy(n->items[0].str, name, l); #ifdef HAVE_VALGRIND_MEMCHECK_H VALGRIND_MAKE_MEM_DEFINED(n, n->size); @@ -128,12 +131,14 @@ _public_ int sd_bus_request_name(sd_bus *bus, const char *name, uint64_t flags) assert_return(bus, -EINVAL); assert_return(name, -EINVAL); assert_return(bus->bus_client, -EINVAL); - assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN); assert_return(!bus_pid_changed(bus), -ECHILD); assert_return(!(flags & ~(SD_BUS_NAME_ALLOW_REPLACEMENT|SD_BUS_NAME_REPLACE_EXISTING|SD_BUS_NAME_QUEUE)), -EINVAL); assert_return(service_name_is_valid(name), -EINVAL); assert_return(name[0] != ':', -EINVAL); + if (!BUS_IS_OPEN(bus->state)) + return -ENOTCONN; + if (bus->is_kernel) return bus_request_name_kernel(bus, name, flags); else @@ -142,16 +147,20 @@ _public_ int sd_bus_request_name(sd_bus *bus, const char *name, uint64_t flags) static int bus_release_name_kernel(sd_bus *bus, const char *name) { struct kdbus_cmd_name *n; - size_t l; + size_t size, l; int r; assert(bus); assert(name); - l = strlen(name); - n = alloca0(offsetof(struct kdbus_cmd_name, name) + l + 1); - n->size = offsetof(struct kdbus_cmd_name, name) + l + 1; - memcpy(n->name, name, l+1); + l = strlen(name) + 1; + size = offsetof(struct kdbus_cmd_name, items) + KDBUS_ITEM_SIZE(l); + n = alloca0_align(size, 8); + n->size = size; + + n->items[0].size = KDBUS_ITEM_HEADER_SIZE + l; + n->items[0].type = KDBUS_ITEM_NAME; + memcpy(n->items[0].str, name, l); #ifdef HAVE_VALGRIND_MEMCHECK_H VALGRIND_MAKE_MEM_DEFINED(n, n->size); @@ -160,7 +169,7 @@ static int bus_release_name_kernel(sd_bus *bus, const char *name) { if (r < 0) return -errno; - return n->flags; + return 0; } static int bus_release_name_dbus1(sd_bus *bus, const char *name) { @@ -201,21 +210,40 @@ _public_ int sd_bus_release_name(sd_bus *bus, const char *name) { assert_return(bus, -EINVAL); assert_return(name, -EINVAL); assert_return(bus->bus_client, -EINVAL); - assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN); assert_return(!bus_pid_changed(bus), -ECHILD); assert_return(service_name_is_valid(name), -EINVAL); assert_return(name[0] != ':', -EINVAL); + if (!BUS_IS_OPEN(bus->state)) + return -ENOTCONN; + if (bus->is_kernel) return bus_release_name_kernel(bus, name); else return bus_release_name_dbus1(bus, name); } +static int kernel_cmd_free(sd_bus *bus, uint64_t offset) +{ + struct kdbus_cmd_free cmd; + int r; + + assert(bus); + + cmd.flags = 0; + cmd.offset = offset; + + r = ioctl(bus->input_fd, KDBUS_CMD_FREE, &cmd); + if (r < 0) + return -errno; + + return 0; +} + static int kernel_get_list(sd_bus *bus, uint64_t flags, char ***x) { struct kdbus_cmd_name_list cmd = {}; struct kdbus_name_list *name_list; - struct kdbus_cmd_name *name; + struct kdbus_name_info *name; uint64_t previous_id = 0; int r; @@ -231,33 +259,42 @@ static int kernel_get_list(sd_bus *bus, uint64_t flags, char ***x) { KDBUS_ITEM_FOREACH(name, name_list, names) { + struct kdbus_item *item; + const char *entry_name = NULL; + if ((flags & KDBUS_NAME_LIST_UNIQUE) && name->owner_id != previous_id) { char *n; - if (asprintf(&n, ":1.%llu", (unsigned long long) name->owner_id) < 0) - return -ENOMEM; - - r = strv_push(x, n); - if (r < 0) { - free(n); - return -ENOMEM; + if (asprintf(&n, ":1.%llu", (unsigned long long) name->owner_id) < 0) { + r = -ENOMEM; + goto fail; } + r = strv_consume(x, n); + if (r < 0) + goto fail; + previous_id = name->owner_id; } - if (name->size > sizeof(*name) && service_name_is_valid(name->name)) { - r = strv_extend(x, name->name); - if (r < 0) - return -ENOMEM; + KDBUS_ITEM_FOREACH(item, name, items) + if (item->type == KDBUS_ITEM_NAME) + entry_name = item->str; + + if (entry_name && service_name_is_valid(entry_name)) { + r = strv_extend(x, entry_name); + if (r < 0) { + r = -ENOMEM; + goto fail; + } } } - r = ioctl(bus->input_fd, KDBUS_CMD_FREE, &cmd.offset); - if (r < 0) - return -errno; + r = 0; - return 0; +fail: + kernel_cmd_free(bus, cmd.offset); + return r; } static int bus_list_names_kernel(sd_bus *bus, char ***acquired, char ***activatable) { @@ -344,67 +381,27 @@ static int bus_list_names_dbus1(sd_bus *bus, char ***acquired, char ***activatab _public_ int sd_bus_list_names(sd_bus *bus, char ***acquired, char ***activatable) { assert_return(bus, -EINVAL); assert_return(acquired || activatable, -EINVAL); - assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN); assert_return(!bus_pid_changed(bus), -ECHILD); + if (!BUS_IS_OPEN(bus->state)) + return -ENOTCONN; + if (bus->is_kernel) return bus_list_names_kernel(bus, acquired, activatable); else return bus_list_names_dbus1(bus, acquired, activatable); } -static int bus_get_owner_kdbus( - sd_bus *bus, - const char *name, - uint64_t mask, - sd_bus_creds **creds) { +static int bus_populate_creds_from_items(sd_bus *bus, + struct kdbus_info *info, + uint64_t mask, + sd_bus_creds *c) { - _cleanup_bus_creds_unref_ sd_bus_creds *c = NULL; - struct kdbus_cmd_conn_info *cmd; - struct kdbus_conn_info *conn_info; struct kdbus_item *item; - size_t size; - uint64_t m, id; + uint64_t m; int r; - r = bus_kernel_parse_unique_name(name, &id); - if (r < 0) - return r; - if (r > 0) { - size = offsetof(struct kdbus_cmd_conn_info, name); - cmd = alloca0(size); - cmd->id = id; - } else { - size = offsetof(struct kdbus_cmd_conn_info, name) + strlen(name) + 1; - cmd = alloca0(size); - strcpy(cmd->name, name); - } - - cmd->size = size; - kdbus_translate_attach_flags(mask, (uint64_t*) &cmd->flags); - - r = ioctl(bus->input_fd, KDBUS_CMD_CONN_INFO, cmd); - if (r < 0) - return -errno; - - conn_info = (struct kdbus_conn_info *) ((uint8_t *) bus->kdbus_buffer + cmd->offset); - - /* Non-activated names are considered not available */ - if (conn_info->flags & KDBUS_HELLO_ACTIVATOR) - return name[0] == ':' ? -ENXIO : -ENOENT; - - c = bus_creds_new(); - if (!c) - return -ENOMEM; - - if (mask & SD_BUS_CREDS_UNIQUE_NAME) { - if (asprintf(&c->unique_name, ":1.%llu", (unsigned long long) conn_info->id) < 0) - return -ENOMEM; - - c->mask |= SD_BUS_CREDS_UNIQUE_NAME; - } - - KDBUS_ITEM_FOREACH(item, conn_info, items) { + KDBUS_ITEM_FOREACH(item, info, items) { switch (item->type) { @@ -433,10 +430,8 @@ static int bus_get_owner_kdbus( case KDBUS_ITEM_PID_COMM: if (mask & SD_BUS_CREDS_COMM) { c->comm = strdup(item->str); - if (!c->comm) { - r = -ENOMEM; - goto fail; - } + if (!c->comm) + return -ENOMEM; c->mask |= SD_BUS_CREDS_COMM; } @@ -445,10 +440,8 @@ static int bus_get_owner_kdbus( case KDBUS_ITEM_TID_COMM: if (mask & SD_BUS_CREDS_TID_COMM) { c->tid_comm = strdup(item->str); - if (!c->tid_comm) { - r = -ENOMEM; - goto fail; - } + if (!c->tid_comm) + return -ENOMEM; c->mask |= SD_BUS_CREDS_TID_COMM; } @@ -457,10 +450,8 @@ static int bus_get_owner_kdbus( case KDBUS_ITEM_EXE: if (mask & SD_BUS_CREDS_EXE) { c->exe = strdup(item->str); - if (!c->exe) { - r = -ENOMEM; - goto fail; - } + if (!c->exe) + return -ENOMEM; c->mask |= SD_BUS_CREDS_EXE; } @@ -470,10 +461,8 @@ static int bus_get_owner_kdbus( if (mask & SD_BUS_CREDS_CMDLINE) { c->cmdline_size = item->size - KDBUS_ITEM_HEADER_SIZE; c->cmdline = memdup(item->data, c->cmdline_size); - if (!c->cmdline) { - r = -ENOMEM; - goto fail; - } + if (!c->cmdline) + return -ENOMEM; c->mask |= SD_BUS_CREDS_CMDLINE; } @@ -486,22 +475,16 @@ static int bus_get_owner_kdbus( if (m) { c->cgroup = strdup(item->str); - if (!c->cgroup) { - r = -ENOMEM; - goto fail; - } + if (!c->cgroup) + return -ENOMEM; - if (!bus->cgroup_root) { - r = cg_get_root_path(&bus->cgroup_root); - if (r < 0) - goto fail; - } + r = bus_get_root_path(bus); + if (r < 0) + return r; c->cgroup_root = strdup(bus->cgroup_root); - if (!c->cgroup_root) { - r = -ENOMEM; - goto fail; - } + if (!c->cgroup_root) + return -ENOMEM; c->mask |= m; } @@ -514,10 +497,8 @@ static int bus_get_owner_kdbus( if (m) { c->capability_size = item->size - KDBUS_ITEM_HEADER_SIZE; c->capability = memdup(item->data, c->capability_size); - if (!c->capability) { - r = -ENOMEM; - goto fail; - } + if (!c->capability) + return -ENOMEM; c->mask |= m; } @@ -526,10 +507,8 @@ static int bus_get_owner_kdbus( case KDBUS_ITEM_SECLABEL: if (mask & SD_BUS_CREDS_SELINUX_CONTEXT) { c->label = strdup(item->str); - if (!c->label) { - r = -ENOMEM; - goto fail; - } + if (!c->label) + return -ENOMEM; c->mask |= SD_BUS_CREDS_SELINUX_CONTEXT; } @@ -549,7 +528,7 @@ static int bus_get_owner_kdbus( if ((mask & SD_BUS_CREDS_WELL_KNOWN_NAMES) && service_name_is_valid(item->name.name)) { r = strv_extend(&c->well_known_names, item->name.name); if (r < 0) - goto fail; + return r; c->mask |= SD_BUS_CREDS_WELL_KNOWN_NAMES; } @@ -558,10 +537,8 @@ static int bus_get_owner_kdbus( case KDBUS_ITEM_CONN_NAME: if ((mask & SD_BUS_CREDS_CONNECTION_NAME)) { c->conn_name = strdup(item->str); - if (!c->conn_name) { - r = -ENOMEM; - goto fail; - } + if (!c->conn_name) + return -ENOMEM; c->mask |= SD_BUS_CREDS_CONNECTION_NAME; } @@ -569,6 +546,75 @@ static int bus_get_owner_kdbus( } } + return 0; +} + +static int bus_get_name_creds_kdbus( + sd_bus *bus, + const char *name, + uint64_t mask, + sd_bus_creds **creds) { + + _cleanup_bus_creds_unref_ sd_bus_creds *c = NULL; + struct kdbus_cmd_info *cmd; + struct kdbus_info *conn_info; + size_t size, l; + uint64_t id; + int r; + + r = bus_kernel_parse_unique_name(name, &id); + if (r < 0) + return r; + if (r > 0) { + size = offsetof(struct kdbus_cmd_info, items); + cmd = alloca0_align(size, 8); + cmd->id = id; + } else { + l = strlen(name) + 1; + size = offsetof(struct kdbus_cmd_info, items) + KDBUS_ITEM_SIZE(l); + cmd = alloca0_align(size, 8); + cmd->items[0].size = KDBUS_ITEM_HEADER_SIZE + l; + cmd->items[0].type = KDBUS_ITEM_NAME; + memcpy(cmd->items[0].str, name, l); + } + + cmd->size = size; + kdbus_translate_attach_flags(mask, (uint64_t*) &cmd->flags); + + r = ioctl(bus->input_fd, KDBUS_CMD_CONN_INFO, cmd); + if (r < 0) + return -errno; + + conn_info = (struct kdbus_info *) ((uint8_t *) bus->kdbus_buffer + cmd->offset); + + /* Non-activated names are considered not available */ + if (conn_info->flags & KDBUS_HELLO_ACTIVATOR) { + if (name[0] == ':') + r = -ENXIO; + else + r = -ESRCH; + goto fail; + } + + c = bus_creds_new(); + if (!c) { + r = -ENOMEM; + goto fail; + } + + if (mask & SD_BUS_CREDS_UNIQUE_NAME) { + if (asprintf(&c->unique_name, ":1.%llu", (unsigned long long) conn_info->id) < 0) { + r = -ENOMEM; + goto fail; + } + + c->mask |= SD_BUS_CREDS_UNIQUE_NAME; + } + + r = bus_populate_creds_from_items(bus, conn_info, mask, c); + if (r < 0) + goto fail; + if (creds) { *creds = c; c = NULL; @@ -577,11 +623,11 @@ static int bus_get_owner_kdbus( r = 0; fail: - ioctl(bus->input_fd, KDBUS_CMD_FREE, &cmd->offset); + kernel_cmd_free(bus, cmd->offset); return r; } -static int bus_get_owner_dbus1( +static int bus_get_name_creds_dbus1( sd_bus *bus, const char *name, uint64_t mask, @@ -687,8 +733,8 @@ static int bus_get_owner_dbus1( } if (mask & SD_BUS_CREDS_SELINUX_CONTEXT) { - const void *p; - size_t sz; + const void *p = NULL; + size_t sz = 0; r = sd_bus_call_method( bus, @@ -727,7 +773,7 @@ static int bus_get_owner_dbus1( return 0; } -_public_ int sd_bus_get_owner( +_public_ int sd_bus_get_name_creds( sd_bus *bus, const char *name, uint64_t mask, @@ -737,15 +783,17 @@ _public_ int sd_bus_get_owner( assert_return(name, -EINVAL); assert_return(mask <= _SD_BUS_CREDS_ALL, -ENOTSUP); assert_return(mask == 0 || creds, -EINVAL); - assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN); assert_return(!bus_pid_changed(bus), -ECHILD); assert_return(service_name_is_valid(name), -EINVAL); assert_return(bus->bus_client, -ENODATA); + if (!BUS_IS_OPEN(bus->state)) + return -ENOTCONN; + if (bus->is_kernel) - return bus_get_owner_kdbus(bus, name, mask, creds); + return bus_get_name_creds_kdbus(bus, name, mask, creds); else - return bus_get_owner_dbus1(bus, name, mask, creds); + return bus_get_name_creds_dbus1(bus, name, mask, creds); } static int add_name_change_match(sd_bus *bus, @@ -823,7 +871,7 @@ static int add_name_change_match(sd_bus *bus, offsetof(struct kdbus_notify_name_change, name) + l); - m = alloca0(sz); + m = alloca0_align(sz, 8); m->size = sz; m->cookie = cookie; @@ -833,8 +881,8 @@ static int add_name_change_match(sd_bus *bus, offsetof(struct kdbus_notify_name_change, name) + l; - item->name_change.old.id = old_owner_id; - item->name_change.new.id = new_owner_id; + item->name_change.old_id.id = old_owner_id; + item->name_change.new_id.id = new_owner_id; if (name) memcpy(item->name_change.name, name, l); @@ -883,7 +931,7 @@ static int add_name_change_match(sd_bus *bus, offsetof(struct kdbus_item, id_change) + sizeof(struct kdbus_notify_id_change)); - m = alloca0(sz); + m = alloca0_align(sz, 8); m->size = sz; m->cookie = cookie; @@ -919,7 +967,6 @@ static int add_name_change_match(sd_bus *bus, int bus_add_match_internal_kernel( sd_bus *bus, - uint64_t id, struct bus_match_component *components, unsigned n_components, uint64_t cookie) { @@ -1054,10 +1101,9 @@ int bus_add_match_internal_kernel( if (using_bloom) sz += ALIGN8(offsetof(struct kdbus_item, data64) + bus->bloom_size); - m = alloca0(sz); + m = alloca0_align(sz, 8); m->size = sz; m->cookie = cookie; - m->owner_id = id; item = m->items; @@ -1100,13 +1146,22 @@ int bus_add_match_internal_kernel( return 0; } +#define internal_match(bus, m) \ + ((bus)->hello_flags & KDBUS_HELLO_MONITOR \ + ? (isempty(m) ? "eavesdrop='true'" : strappenda((m), ",eavesdrop='true'")) \ + : (m)) + static int bus_add_match_internal_dbus1( sd_bus *bus, const char *match) { + const char *e; + assert(bus); assert(match); + e = internal_match(bus, match); + return sd_bus_call_method( bus, "org.freedesktop.DBus", @@ -1116,7 +1171,7 @@ static int bus_add_match_internal_dbus1( NULL, NULL, "s", - match); + e); } int bus_add_match_internal( @@ -1127,17 +1182,15 @@ int bus_add_match_internal( uint64_t cookie) { assert(bus); - assert(match); if (bus->is_kernel) - return bus_add_match_internal_kernel(bus, 0, components, n_components, cookie); + return bus_add_match_internal_kernel(bus, components, n_components, cookie); else return bus_add_match_internal_dbus1(bus, match); } int bus_remove_match_internal_kernel( sd_bus *bus, - uint64_t id, uint64_t cookie) { struct kdbus_cmd_match m; @@ -1148,7 +1201,6 @@ int bus_remove_match_internal_kernel( zero(m); m.size = offsetof(struct kdbus_cmd_match, items); m.cookie = cookie; - m.owner_id = id; r = ioctl(bus->input_fd, KDBUS_CMD_MATCH_REMOVE, &m); if (r < 0) @@ -1161,9 +1213,13 @@ static int bus_remove_match_internal_dbus1( sd_bus *bus, const char *match) { + const char *e; + assert(bus); assert(match); + e = internal_match(bus, match); + return sd_bus_call_method( bus, "org.freedesktop.DBus", @@ -1173,7 +1229,7 @@ static int bus_remove_match_internal_dbus1( NULL, NULL, "s", - match); + e); } int bus_remove_match_internal( @@ -1182,15 +1238,14 @@ int bus_remove_match_internal( uint64_t cookie) { assert(bus); - assert(match); if (bus->is_kernel) - return bus_remove_match_internal_kernel(bus, 0, cookie); + return bus_remove_match_internal_kernel(bus, cookie); else return bus_remove_match_internal_dbus1(bus, match); } -_public_ int sd_bus_get_owner_machine_id(sd_bus *bus, const char *name, sd_id128_t *machine) { +_public_ int sd_bus_get_name_machine_id(sd_bus *bus, const char *name, sd_id128_t *machine) { _cleanup_bus_message_unref_ sd_bus_message *reply = NULL, *m = NULL; const char *mid; int r; @@ -1198,19 +1253,22 @@ _public_ int sd_bus_get_owner_machine_id(sd_bus *bus, const char *name, sd_id128 assert_return(bus, -EINVAL); assert_return(name, -EINVAL); assert_return(machine, -EINVAL); - assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN); assert_return(!bus_pid_changed(bus), -ECHILD); assert_return(service_name_is_valid(name), -EINVAL); + if (!BUS_IS_OPEN(bus->state)) + return -ENOTCONN; + if (streq_ptr(name, bus->unique_name)) return sd_id128_get_machine(machine); r = sd_bus_message_new_method_call( bus, + &m, name, "/", "org.freedesktop.DBus.Peer", - "GetMachineId", &m); + "GetMachineId"); if (r < 0) return r;