X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-bus%2Fbus-kernel.c;h=369eac468b21454a68e141e92042b8b874cd5467;hb=ff2ea19264b016bd34232cd9c4820c9547413a9a;hp=92acbeec5eda9148dfbed97f17d9c80893e513f2;hpb=e599ba01f564161966b3b8c93cc229daf847e807;p=elogind.git diff --git a/src/libsystemd-bus/bus-kernel.c b/src/libsystemd-bus/bus-kernel.c index 92acbeec5..369eac468 100644 --- a/src/libsystemd-bus/bus-kernel.c +++ b/src/libsystemd-bus/bus-kernel.c @@ -363,6 +363,7 @@ int bus_kernel_take_fd(sd_bus *b) { 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)); @@ -514,18 +515,19 @@ static int translate_name_change(sd_bus *bus, struct kdbus_msg *k, struct kdbus_ assert(k); assert(d); - if (d->name_change.flags & (KDBUS_NAME_IN_QUEUE|KDBUS_NAME_STARTER)) - 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); + sprintf(old_owner, ":1.%llu", (unsigned long long) d->name_change.old.id); + + 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; - if (d->type == KDBUS_ITEM_NAME_REMOVE) new_owner[0] = 0; - else - sprintf(new_owner, ":1.%llu", (unsigned long long) d->name_change.new_id); + } 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); } @@ -634,7 +636,7 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k) { case KDBUS_ITEM_PAYLOAD_OFF: if (!h) { - h = (struct bus_header *)((uint8_t *)bus->kdbus_buffer + d->vec.offset); + h = (struct bus_header *)((uint8_t *)k + d->vec.offset); if (!bus_header_is_complete(h, d->vec.size)) return -EBADMSG; @@ -719,11 +721,11 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k) { if (idx >= begin_body) { if (!part->is_zero) - part->data = (uint8_t *)bus->kdbus_buffer + d->vec.offset; + part->data = (uint8_t *)k + d->vec.offset; part->size = d->vec.size; } else { if (!part->is_zero) - part->data = (uint8_t *)bus->kdbus_buffer + d->vec.offset + (begin_body - idx); + part->data = (uint8_t *)k + d->vec.offset + (begin_body - idx); part->size = d->vec.size - (begin_body - idx); } @@ -832,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 { @@ -916,12 +919,13 @@ int bus_kernel_read_message(sd_bus *bus) { return r < 0 ? r : 1; } -int bus_kernel_pop_memfd(sd_bus *bus, void **address, size_t *size) { +int bus_kernel_pop_memfd(sd_bus *bus, void **address, size_t *mapped, size_t *allocated) { struct memfd_cache *c; int fd; assert(address); - assert(size); + assert(mapped); + assert(allocated); if (!bus || !bus->is_kernel) return -ENOTSUP; @@ -938,17 +942,19 @@ int bus_kernel_pop_memfd(sd_bus *bus, void **address, size_t *size) { return -errno; *address = NULL; - *size = 0; + *mapped = 0; + *allocated = 0; return fd; } c = &bus->memfd_cache[--bus->n_memfd_cache]; assert(c->fd >= 0); - assert(c->size == 0 || c->address); + assert(c->mapped == 0 || c->address); *address = c->address; - *size = c->size; + *mapped = c->mapped; + *allocated = c->allocated; fd = c->fd; assert_se(pthread_mutex_unlock(&bus->memfd_cache_mutex) >= 0); @@ -963,15 +969,15 @@ static void close_and_munmap(int fd, void *address, size_t size) { close_nointr_nofail(fd); } -void bus_kernel_push_memfd(sd_bus *bus, int fd, void *address, size_t size) { +void bus_kernel_push_memfd(sd_bus *bus, int fd, void *address, size_t mapped, size_t allocated) { struct memfd_cache *c; - uint64_t max_sz = PAGE_ALIGN(MEMFD_CACHE_ITEM_SIZE_MAX); + uint64_t max_mapped = PAGE_ALIGN(MEMFD_CACHE_ITEM_SIZE_MAX); assert(fd >= 0); - assert(size == 0 || address); + assert(mapped == 0 || address); if (!bus || !bus->is_kernel) { - close_and_munmap(fd, address, size); + close_and_munmap(fd, address, mapped); return; } @@ -980,7 +986,7 @@ void bus_kernel_push_memfd(sd_bus *bus, int fd, void *address, size_t size) { if (bus->n_memfd_cache >= ELEMENTSOF(bus->memfd_cache)) { assert_se(pthread_mutex_unlock(&bus->memfd_cache_mutex) >= 0); - close_and_munmap(fd, address, size); + close_and_munmap(fd, address, mapped); return; } @@ -989,12 +995,14 @@ void bus_kernel_push_memfd(sd_bus *bus, int fd, void *address, size_t size) { c->address = address; /* If overly long, let's return a bit to the OS */ - if (size > max_sz) { - assert_se(ioctl(fd, KDBUS_CMD_MEMFD_SIZE_SET, &max_sz) >= 0); - assert_se(munmap((uint8_t*) address + max_sz, PAGE_ALIGN(size - max_sz)) >= 0); - c->size = max_sz; - } else - c->size = size; + if (mapped > max_mapped) { + assert_se(ioctl(fd, KDBUS_CMD_MEMFD_SIZE_SET, &max_mapped) >= 0); + assert_se(munmap((uint8_t*) address + max_mapped, PAGE_ALIGN(mapped - max_mapped)) >= 0); + c->mapped = c->allocated = max_mapped; + } else { + c->mapped = mapped; + c->allocated = allocated; + } assert_se(pthread_mutex_unlock(&bus->memfd_cache_mutex) >= 0); } @@ -1005,7 +1013,7 @@ void bus_kernel_flush_memfd(sd_bus *b) { assert(b); for (i = 0; i < b->n_memfd_cache; i++) - close_and_munmap(b->memfd_cache[i].fd, b->memfd_cache[i].address, b->memfd_cache[i].size); + close_and_munmap(b->memfd_cache[i].fd, b->memfd_cache[i].address, b->memfd_cache[i].mapped); } int kdbus_translate_request_name_flags(uint64_t flags, uint64_t *kdbus_flags) { @@ -1019,7 +1027,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 +1071,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; @@ -1074,19 +1082,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); @@ -1138,10 +1154,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) { @@ -1166,7 +1182,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; @@ -1177,7 +1193,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)); @@ -1186,7 +1202,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) { @@ -1216,18 +1232,37 @@ 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; +int bus_kernel_create_monitor(const char *bus) { + struct kdbus_cmd_hello *hello; + char *p; + int fd; assert(bus); - cmd_monitor.id = 0; - cmd_monitor.flags = KDBUS_MONITOR_ENABLE; + 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); - r = ioctl(bus->input_fd, KDBUS_CMD_MONITOR, &cmd_monitor); - if (r < 0) + fd = open(p, O_RDWR|O_NOCTTY|O_CLOEXEC); + if (fd < 0) return -errno; - return 1; + 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; }