X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd%2Fsd-bus%2Fbus-kernel.c;h=09ff25fe71acafd4f5cc28c9d9b23bf1543e5e03;hb=125dd07483b6836106ff9ad3ce1737d8a6c56c59;hp=b3cc996b1e869fe391d3cf7da0ef759532244afb;hpb=4edf33d1e3fb551b1b0cee8e4a2a380c71b00dc7;p=elogind.git diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c index b3cc996b1..09ff25fe7 100644 --- a/src/libsystemd/sd-bus/bus-kernel.c +++ b/src/libsystemd/sd-bus/bus-kernel.c @@ -332,6 +332,18 @@ fail: return r; } +static void unset_memfds(struct sd_bus_message *m) { + struct bus_body_part *part; + unsigned i; + + assert(m); + + /* Make sure the memfds are not freed twice */ + MESSAGE_FOREACH_PART(part, i, m) + if (part->memfd >= 0) + part->memfd = -1; +} + static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k) { sd_bus_message *m = NULL; struct kdbus_item *d; @@ -627,17 +639,8 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k) { return 1; fail: - if (m) { - struct bus_body_part *part; - unsigned i; - - /* Make sure the memfds are not freed twice */ - MESSAGE_FOREACH_PART(part, i, m) - if (part->memfd >= 0) - part->memfd = -1; - - sd_bus_message_unref(m); - } + unset_memfds(m); + sd_bus_message_unref(m); return r; } @@ -709,7 +712,7 @@ int bus_kernel_take_fd(sd_bus *b) { sz += ALIGN8(offsetof(struct kdbus_item, str) + l + 1); } - hello = alloca0(sz); + hello = alloca0_align(sz, 8); hello->size = sz; hello->conn_flags = b->hello_flags; hello->attach_flags = b->attach_flags; @@ -796,7 +799,7 @@ int bus_kernel_connect(sd_bus *b) { } static void close_kdbus_msg(sd_bus *bus, struct kdbus_msg *k) { - uint64_t off; + uint64_t off _alignas_(8); struct kdbus_item *d; assert(bus); @@ -950,19 +953,19 @@ static int translate_name_change(sd_bus *bus, struct kdbus_msg *k, struct kdbus_ assert(k); assert(d); - if (d->type == KDBUS_ITEM_NAME_ADD || (d->name_change.old.flags & (KDBUS_NAME_IN_QUEUE|KDBUS_NAME_ACTIVATOR))) + if (d->type == KDBUS_ITEM_NAME_ADD || (d->name_change.old_id.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.id); - if (d->type == KDBUS_ITEM_NAME_REMOVE || (d->name_change.new.flags & (KDBUS_NAME_IN_QUEUE|KDBUS_NAME_ACTIVATOR))) { + if (d->type == KDBUS_ITEM_NAME_REMOVE || (d->name_change.new_id.flags & (KDBUS_NAME_IN_QUEUE|KDBUS_NAME_ACTIVATOR))) { if (isempty(old_owner)) return 0; new_owner[0] = 0; } else - sprintf(new_owner, ":1.%llu", (unsigned long long) d->name_change.new.id); + sprintf(new_owner, ":1.%llu", (unsigned long long) d->name_change.new_id.id); return push_name_owner_changed(bus, d->name_change.name, old_owner, new_owner); } @@ -1268,10 +1271,11 @@ int bus_kernel_create_bus(const char *name, bool world, char **s) { if (fd < 0) return -errno; - 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 = alloca0_align(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), + 8); make->size = offsetof(struct kdbus_cmd_make, items); @@ -1410,7 +1414,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; + _cleanup_free_ char *path = NULL; struct kdbus_cmd_make *make; struct kdbus_item *n; size_t size; @@ -1423,7 +1427,7 @@ int bus_kernel_create_endpoint(const char *bus_name, const char *ep_name, char * size = ALIGN8(offsetof(struct kdbus_cmd_make, items)); size += ALIGN8(offsetof(struct kdbus_item, str) + strlen(ep_name) + 1); - make = alloca0(size); + make = alloca0_align(size, 8); make->size = size; make->flags = KDBUS_MAKE_ACCESS_WORLD; @@ -1446,11 +1450,15 @@ int bus_kernel_create_endpoint(const char *bus_name, const char *ep_name, char * } if (ep_path) { - int r = asprintf(ep_path, "%s/%s", dirname(path), ep_name); - if (r == -1 || !*ep_path) { + char *p; + + p = strjoin(dirname(path), "/", ep_name, NULL); + if (!p) { safe_close(fd); return -ENOMEM; } + + *ep_path = p; } return fd; @@ -1472,7 +1480,7 @@ int bus_kernel_set_endpoint_policy(int fd, uid_t uid, BusEndpoint *ep) { size += ALIGN8(offsetof(struct kdbus_item, policy_access) + sizeof(struct kdbus_policy_access)); } - update = alloca0(size); + update = alloca0_align(size, 8); update->size = size; n = update->items; @@ -1528,7 +1536,7 @@ int bus_kernel_make_starter( ALIGN8(offsetof(struct kdbus_item, str) + strlen(name) + 1) + policy_cnt * ALIGN8(offsetof(struct kdbus_item, policy_access) + sizeof(struct kdbus_policy_access)); - hello = alloca0(size); + hello = alloca0_align(size, 8); n = hello->items; strcpy(n->str, name); @@ -1588,9 +1596,10 @@ int bus_kernel_create_domain(const char *name, char **s) { if (fd < 0) return -errno; - make = alloca0(ALIGN8(offsetof(struct kdbus_cmd_make, items) + - offsetof(struct kdbus_item, str) + - strlen(name) + 1)); + make = alloca0_align(ALIGN8(offsetof(struct kdbus_cmd_make, items) + + offsetof(struct kdbus_item, str) + + strlen(name) + 1), + 8); n = make->items; strcpy(n->str, name);