X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flibsystemd-bus%2Fbus-kernel.c;h=5be91d46468fbb29d9f62ce379abc452ac54fcd1;hp=a3afb2eba68fb0bb21a40e96e273207b32c1a23f;hb=816a3f9ec58a695a859aa9718c245a9476d72654;hpb=6647dc6659e1e42b3cff3cf5033ea5624000e650 diff --git a/src/libsystemd-bus/bus-kernel.c b/src/libsystemd-bus/bus-kernel.c index a3afb2eba..5be91d464 100644 --- a/src/libsystemd-bus/bus-kernel.c +++ b/src/libsystemd-bus/bus-kernel.c @@ -362,6 +362,8 @@ int bus_kernel_take_fd(sd_bus *b) { b->is_kernel = true; b->bus_client = true; b->can_fds = !!(hello.conn_flags & KDBUS_HELLO_ACCEPT_FD); + b->message_version = 2; + b->message_endian = BUS_NATIVE_ENDIAN; /* the kernel told us the UUID of the underlying bus */ memcpy(b->server_id.bytes, hello.id128, sizeof(b->server_id.bytes)); @@ -417,8 +419,10 @@ int bus_kernel_write_message(sd_bus *bus, sd_bus_message *m) { if (m->header->type == SD_BUS_MESSAGE_METHOD_CALL) sd_bus_error_setf(&error, SD_BUS_ERROR_SERVICE_UNKNOWN, "Destination %s not known", m->destination); - else + else { + log_debug("Could not deliver message to %s as destination is not known. Ignoring.", m->destination); return 0; + } } else if (errno == EADDRNOTAVAIL) { @@ -426,8 +430,10 @@ int bus_kernel_write_message(sd_bus *bus, sd_bus_message *m) { if (m->header->type == SD_BUS_MESSAGE_METHOD_CALL) sd_bus_error_setf(&error, SD_BUS_ERROR_SERVICE_UNKNOWN, "Activation of %s not requested", m->destination); - else + else { + log_debug("Could not deliver message to %s as destination is not activated. Ignoring.", m->destination); return 0; + } } else return -errno; @@ -509,17 +515,18 @@ static int translate_name_change(sd_bus *bus, struct kdbus_msg *k, struct kdbus_ assert(k); assert(d); - if (d->name_change.flags != 0) - return 0; - - if (d->type == KDBUS_ITEM_NAME_ADD) + if (d->type == KDBUS_ITEM_NAME_ADD || (d->name_change.old_flags & (KDBUS_NAME_IN_QUEUE|KDBUS_NAME_ACTIVATOR))) old_owner[0] = 0; else sprintf(old_owner, ":1.%llu", (unsigned long long) d->name_change.old_id); - if (d->type == KDBUS_ITEM_NAME_REMOVE) + if (d->type == KDBUS_ITEM_NAME_REMOVE || (d->name_change.new_flags & (KDBUS_NAME_IN_QUEUE|KDBUS_NAME_ACTIVATOR))) { + + if (isempty(old_owner)) + return 0; + new_owner[0] = 0; - else + } else sprintf(new_owner, ":1.%llu", (unsigned long long) d->name_change.new_id); return push_name_owner_changed(bus, d->name_change.name, old_owner, new_owner); @@ -676,6 +683,12 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k) { if (n_bytes != total) return -EBADMSG; + /* on kdbus we only speak native endian gvariant, never dbus1 + * marshalling or reverse endian */ + if (h->version != 2 || + h->endian != BUS_NATIVE_ENDIAN) + return -EPROTOTYPE; + r = bus_message_from_header(bus, h, sizeof(struct bus_header), fds, n_fds, NULL, seclabel, 0, &m); if (r < 0) return r; @@ -821,6 +834,7 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k) { if (r < 0) goto fail; + /* Override information from the user header with data from the kernel */ if (k->src_id == KDBUS_SRC_ID_KERNEL) m->sender = "org.freedesktop.DBus"; else { @@ -885,9 +899,16 @@ int bus_kernel_read_message(sd_bus *bus) { } k = (struct kdbus_msg *)((uint8_t *)bus->kdbus_buffer + off); - if (k->payload_type == KDBUS_PAYLOAD_DBUS) + if (k->payload_type == KDBUS_PAYLOAD_DBUS) { r = bus_kernel_make_message(bus, k); - else if (k->payload_type == KDBUS_PAYLOAD_KERNEL) + + /* Anybody can send us invalid messages, let's just drop them. */ + if (r == -EBADMSG || r == -EPROTOTYPE) { + log_debug("Ignoring invalid message: %s", strerror(-r)); + r = 0; + } + + } else if (k->payload_type == KDBUS_PAYLOAD_KERNEL) r = bus_kernel_translate_message(bus, k); else r = 0; @@ -1001,7 +1022,7 @@ int kdbus_translate_request_name_flags(uint64_t flags, uint64_t *kdbus_flags) { if (flags & SD_BUS_NAME_REPLACE_EXISTING) f |= KDBUS_NAME_REPLACE_EXISTING; - if (!(flags & SD_BUS_NAME_DO_NOT_QUEUE)) + if (flags & SD_BUS_NAME_QUEUE) f |= KDBUS_NAME_QUEUE; *kdbus_flags = f; @@ -1045,7 +1066,7 @@ int kdbus_translate_attach_flags(uint64_t mask, uint64_t *kdbus_mask) { } int bus_kernel_create_bus(const char *name, char **s) { - struct kdbus_cmd_bus_make *make; + struct kdbus_cmd_make *make; struct kdbus_item *n; int fd; @@ -1056,19 +1077,27 @@ int bus_kernel_create_bus(const char *name, char **s) { if (fd < 0) return -errno; - make = alloca0(ALIGN8(offsetof(struct kdbus_cmd_bus_make, items) + + make = alloca0(ALIGN8(offsetof(struct kdbus_cmd_make, items) + + offsetof(struct kdbus_item, data64) + sizeof(uint64_t) + offsetof(struct kdbus_item, str) + DECIMAL_STR_MAX(uid_t) + 1 + strlen(name) + 1)); + make->size = offsetof(struct kdbus_cmd_make, items); + n = make->items; + n->size = offsetof(struct kdbus_item, data64) + sizeof(uint64_t); + n->type = KDBUS_ITEM_BLOOM_SIZE; + n->data64[0] = BLOOM_SIZE; + assert_cc(BLOOM_SIZE % 8 == 0); + make->size += ALIGN8(n->size); + + n = KDBUS_ITEM_NEXT(n); sprintf(n->str, "%lu-%s", (unsigned long) getuid(), name); n->size = offsetof(struct kdbus_item, str) + strlen(n->str) + 1; n->type = KDBUS_ITEM_MAKE_NAME; + make->size += ALIGN8(n->size); - make->size = ALIGN8(offsetof(struct kdbus_cmd_bus_make, items) + n->size); make->flags = KDBUS_MAKE_POLICY_OPEN; - make->bloom_size = BLOOM_SIZE; - assert_cc(BLOOM_SIZE % 8 == 0); if (ioctl(fd, KDBUS_CMD_BUS_MAKE, make) < 0) { close_nointr_nofail(fd); @@ -1120,10 +1149,10 @@ int bus_kernel_create_starter(const char *bus, const char *name) { n = hello->items; strcpy(n->str, name); n->size = offsetof(struct kdbus_item, str) + strlen(n->str) + 1; - n->type = KDBUS_ITEM_STARTER_NAME; + n->type = KDBUS_ITEM_NAME; hello->size = ALIGN8(offsetof(struct kdbus_cmd_hello, items) + n->size); - hello->conn_flags = KDBUS_HELLO_STARTER; + hello->conn_flags = KDBUS_HELLO_ACTIVATOR; hello->pool_size = KDBUS_POOL_SIZE; if (ioctl(fd, KDBUS_CMD_HELLO, hello) < 0) { @@ -1148,7 +1177,7 @@ int bus_kernel_create_starter(const char *bus, const char *name) { } int bus_kernel_create_namespace(const char *name, char **s) { - struct kdbus_cmd_ns_make *make; + struct kdbus_cmd_make *make; struct kdbus_item *n; int fd; @@ -1159,7 +1188,7 @@ int bus_kernel_create_namespace(const char *name, char **s) { if (fd < 0) return -errno; - make = alloca0(ALIGN8(offsetof(struct kdbus_cmd_ns_make, items) + + make = alloca0(ALIGN8(offsetof(struct kdbus_cmd_make, items) + offsetof(struct kdbus_item, str) + strlen(name) + 1)); @@ -1168,7 +1197,7 @@ int bus_kernel_create_namespace(const char *name, char **s) { n->size = offsetof(struct kdbus_item, str) + strlen(n->str) + 1; n->type = KDBUS_ITEM_MAKE_NAME; - make->size = ALIGN8(offsetof(struct kdbus_cmd_ns_make, items) + n->size); + make->size = ALIGN8(offsetof(struct kdbus_cmd_make, items) + n->size); make->flags = KDBUS_MAKE_POLICY_OPEN | KDBUS_MAKE_ACCESS_WORLD; if (ioctl(fd, KDBUS_CMD_NS_MAKE, make) < 0) { @@ -1197,3 +1226,38 @@ int bus_kernel_create_namespace(const char *name, char **s) { return fd; } + +int bus_kernel_create_monitor(const char *bus) { + struct kdbus_cmd_hello *hello; + char *p; + int fd; + + assert(bus); + + p = alloca(sizeof("/dev/kdbus/") - 1 + DECIMAL_STR_MAX(uid_t) + 1 + strlen(bus) + sizeof("/bus")); + sprintf(p, "/dev/kdbus/%lu-%s/bus", (unsigned long) getuid(), bus); + + fd = open(p, O_RDWR|O_NOCTTY|O_CLOEXEC); + if (fd < 0) + return -errno; + + hello = alloca0(sizeof(struct kdbus_cmd_hello)); + hello->size = sizeof(struct kdbus_cmd_hello); + hello->conn_flags = KDBUS_HELLO_ACTIVATOR; + hello->pool_size = KDBUS_POOL_SIZE; + + if (ioctl(fd, KDBUS_CMD_HELLO, hello) < 0) { + close_nointr_nofail(fd); + return -errno; + } + + /* The higher 32bit of both flags fields are considered + * 'incompatible flags'. Refuse them all for now. */ + if (hello->bus_flags > 0xFFFFFFFFULL || + hello->conn_flags > 0xFFFFFFFFULL) { + close_nointr_nofail(fd); + return -ENOTSUP; + } + + return fd; +}