X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-bus%2Fbus-kernel.c;h=0437c96a9e55ce3be20157179e4e9aee01aae3c8;hb=29a07cdb4a317f2e1ea160b79bfe6eb1be2e6e01;hp=f2348918896c2b9cbb8e5eada83857c260471791;hpb=a8d4cac55cf9575d19ff5a1747e726387f5a552f;p=elogind.git diff --git a/src/libsystemd-bus/bus-kernel.c b/src/libsystemd-bus/bus-kernel.c index f23489188..0437c96a9 100644 --- a/src/libsystemd-bus/bus-kernel.c +++ b/src/libsystemd-bus/bus-kernel.c @@ -254,7 +254,7 @@ static int bus_message_setup_kmsg(sd_bus *b, sd_bus_message *m) { m->kdbus->dst_id = well_known ? 0 : m->destination ? unique : KDBUS_DST_ID_BROADCAST; - m->kdbus->payload_type = KDBUS_PAYLOAD_DBUS1; + m->kdbus->payload_type = KDBUS_PAYLOAD_DBUS; m->kdbus->cookie = m->header->serial; m->kdbus->timeout_ns = m->timeout * NSEC_PER_USEC; @@ -362,6 +362,7 @@ 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; /* the kernel told us the UUID of the underlying bus */ memcpy(b->server_id.bytes, hello.id128, sizeof(b->server_id.bytes)); @@ -417,8 +418,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 +429,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 +514,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_STARTER))) 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_STARTER))) { + + 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); @@ -618,7 +624,7 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k) { assert(bus); assert(k); - assert(k->payload_type == KDBUS_PAYLOAD_DBUS1); + assert(k->payload_type == KDBUS_PAYLOAD_DBUS); KDBUS_ITEM_FOREACH(d, k, items) { size_t l; @@ -676,6 +682,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; @@ -885,9 +897,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_DBUS1) + 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 +1020,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; @@ -1063,7 +1082,7 @@ int bus_kernel_create_bus(const char *name, char **s) { n = make->items; sprintf(n->str, "%lu-%s", (unsigned long) getuid(), name); n->size = offsetof(struct kdbus_item, str) + strlen(n->str) + 1; - n->type = KDBUS_MAKE_NAME; + n->type = KDBUS_ITEM_MAKE_NAME; make->size = ALIGN8(offsetof(struct kdbus_cmd_bus_make, items) + n->size); make->flags = KDBUS_MAKE_POLICY_OPEN; @@ -1166,7 +1185,7 @@ int bus_kernel_create_namespace(const char *name, char **s) { n = make->items; strcpy(n->str, name); n->size = offsetof(struct kdbus_item, str) + strlen(n->str) + 1; - n->type = KDBUS_MAKE_NAME; + n->type = KDBUS_ITEM_MAKE_NAME; make->size = ALIGN8(offsetof(struct kdbus_cmd_ns_make, items) + n->size); make->flags = KDBUS_MAKE_POLICY_OPEN | KDBUS_MAKE_ACCESS_WORLD; @@ -1197,3 +1216,19 @@ int bus_kernel_create_namespace(const char *name, char **s) { return fd; } + +int bus_kernel_monitor(sd_bus *bus) { + struct kdbus_cmd_monitor cmd_monitor; + int r; + + assert(bus); + + cmd_monitor.id = 0; + cmd_monitor.flags = KDBUS_MONITOR_ENABLE; + + r = ioctl(bus->input_fd, KDBUS_CMD_MONITOR, &cmd_monitor); + if (r < 0) + return -errno; + + return 1; +}