X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=src%2Flibsystemd%2Fsd-bus%2Fbus-kernel.c;h=bdc770600bd4de57f62625d52ef8bde89e54aeb9;hb=403193f54b6ff0d3e822d56d7144cf996a596146;hp=e73a5077b54948e5ab1a639bfd21a053009460a9;hpb=314808cea4d7655b881ce7b1204efa476e7b8fbb;p=elogind.git diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c index e73a5077b..bdc770600 100644 --- a/src/libsystemd/sd-bus/bus-kernel.c +++ b/src/libsystemd/sd-bus/bus-kernel.c @@ -25,10 +25,15 @@ #include #include -#include #include #include +/* When we include libgen.h because we need dirname() we immediately + * undefine basename() since libgen.h defines it as a macro to the XDG + * version which is really broken. */ +#include +#undef basename + #include "util.h" #include "strv.h" #include "memfd-util.h" @@ -429,7 +434,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; @@ -521,11 +526,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); } @@ -822,10 +827,6 @@ fail: } int bus_kernel_take_fd(sd_bus *b) { - struct kdbus_cmd_free cmd_free = { - .size = sizeof(cmd_free), - .flags = 0, - }; struct kdbus_bloom_parameter *bloom = NULL; struct kdbus_cmd_hello *hello; struct kdbus_item_list *items; @@ -989,12 +990,10 @@ int bus_kernel_take_fd(sd_bus *b) { /* free returned items */ (void) bus_kernel_cmd_free(b, hello->offset); - return bus_start_running(b); fail: - cmd_free.offset = hello->offset; - (void) ioctl(b->input_fd, KDBUS_CMD_FREE, &cmd_free); + (void) bus_kernel_cmd_free(b, hello->offset); return r; } @@ -1019,7 +1018,6 @@ int bus_kernel_connect(sd_bus *b) { int bus_kernel_cmd_free(sd_bus *bus, uint64_t offset) { struct kdbus_cmd_free cmd = { .size = sizeof(cmd), - .flags = 0, .offset = offset, }; int r; @@ -1528,7 +1526,7 @@ uint64_t attach_flags_to_kdbus(uint64_t mask) { } int bus_kernel_create_bus(const char *name, bool world, char **s) { - struct kdbus_cmd_make *make; + struct kdbus_cmd *make; struct kdbus_item *n; size_t l; int fd; @@ -1541,14 +1539,14 @@ int bus_kernel_create_bus(const char *name, bool world, char **s) { return -errno; l = strlen(name); - make = alloca0_align(offsetof(struct kdbus_cmd_make, items) + + make = alloca0_align(offsetof(struct kdbus_cmd, items) + ALIGN8(offsetof(struct kdbus_item, bloom_parameter) + sizeof(struct kdbus_bloom_parameter)) + ALIGN8(offsetof(struct kdbus_item, data64) + sizeof(uint64_t)) + ALIGN8(offsetof(struct kdbus_item, data64) + sizeof(uint64_t)) + ALIGN8(offsetof(struct kdbus_item, str) + DECIMAL_STR_MAX(uid_t) + 1 + l + 1), 8); - make->size = offsetof(struct kdbus_cmd_make, items); + make->size = offsetof(struct kdbus_cmd, items); /* Set the bloom parameters */ n = make->items; @@ -1641,7 +1639,7 @@ int bus_kernel_open_bus_fd(const char *bus, char **path) { int bus_kernel_create_endpoint(const char *bus_name, const char *ep_name, char **ep_path) { _cleanup_free_ char *path = NULL; - struct kdbus_cmd_make *make; + struct kdbus_cmd *make; struct kdbus_item *n; const char *name; int fd; @@ -1650,10 +1648,10 @@ int bus_kernel_create_endpoint(const char *bus_name, const char *ep_name, char * if (fd < 0) return fd; - make = alloca0_align(ALIGN8(offsetof(struct kdbus_cmd_make, items)) + + make = alloca0_align(ALIGN8(offsetof(struct kdbus_cmd, items)) + ALIGN8(offsetof(struct kdbus_item, str) + DECIMAL_STR_MAX(uid_t) + 1 + strlen(ep_name) + 1), 8); - make->size = ALIGN8(offsetof(struct kdbus_cmd_make, items)); + make->size = ALIGN8(offsetof(struct kdbus_cmd, items)); make->flags = KDBUS_MAKE_ACCESS_WORLD; n = make->items; @@ -1684,10 +1682,12 @@ int bus_kernel_create_endpoint(const char *bus_name, const char *ep_name, char * } int bus_kernel_try_close(sd_bus *bus) { + struct kdbus_cmd byebye = { .size = sizeof(byebye) }; + assert(bus); assert(bus->is_kernel); - if (ioctl(bus->input_fd, KDBUS_CMD_BYEBYE) < 0) + if (ioctl(bus->input_fd, KDBUS_CMD_BYEBYE, &byebye) < 0) return -errno; return 0; @@ -1708,13 +1708,13 @@ int bus_kernel_drop_one(int fd) { } int bus_kernel_realize_attach_flags(sd_bus *bus) { - struct kdbus_cmd_update *update; + struct kdbus_cmd *update; struct kdbus_item *n; assert(bus); assert(bus->is_kernel); - update = alloca0_align(offsetof(struct kdbus_cmd_update, items) + + update = alloca0_align(offsetof(struct kdbus_cmd, items) + ALIGN8(offsetof(struct kdbus_item, data64) + sizeof(uint64_t)), 8); @@ -1724,10 +1724,10 @@ int bus_kernel_realize_attach_flags(sd_bus *bus) { n->data64[0] = bus->attach_flags; update->size = - offsetof(struct kdbus_cmd_update, items) + + offsetof(struct kdbus_cmd, items) + ALIGN8(n->size); - if (ioctl(bus->input_fd, KDBUS_CMD_CONN_UPDATE, update) < 0) + if (ioctl(bus->input_fd, KDBUS_CMD_UPDATE, update) < 0) return -errno; return 0;