X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flibsystemd-bus%2Fbus-kernel.c;h=2bb1b9a19a70993ebbcedf7891cd89f7e0d02f17;hp=b2d98c05d70c74b11690f7bd241886f77ef4b1e5;hb=c556fe792d4075a365b276e51666a8009d7dca19;hpb=01f6c9d4685edbc38c8df9175286f0e312dc1938 diff --git a/src/libsystemd-bus/bus-kernel.c b/src/libsystemd-bus/bus-kernel.c index b2d98c05d..2bb1b9a19 100644 --- a/src/libsystemd-bus/bus-kernel.c +++ b/src/libsystemd-bus/bus-kernel.c @@ -24,17 +24,21 @@ #endif #include +#include #include "util.h" #include "bus-internal.h" #include "bus-message.h" #include "bus-kernel.h" +#include "bus-bloom.h" -#define KDBUS_MSG_FOREACH_DATA(d, k) \ - for ((d) = (k)->data; \ - (uint8_t*) (d) < (uint8_t*) (k) + (k)->size; \ - (d) = (struct kdbus_msg_data*) ((uint8_t*) (d) + ALIGN8((d)->size))) +#define KDBUS_ITEM_NEXT(item) \ + (typeof(item))(((uint8_t *)item) + ALIGN8((item)->size)) +#define KDBUS_ITEM_FOREACH(item, head) \ + for (item = (head)->items; \ + (uint8_t *)(item) < (uint8_t *)(head) + (head)->size; \ + item = KDBUS_ITEM_NEXT(item)) static int parse_unique_name(const char *s, uint64_t *id) { int r; @@ -52,49 +56,115 @@ static int parse_unique_name(const char *s, uint64_t *id) { return 1; } -static void append_payload_vec(struct kdbus_msg_data **d, const void *p, size_t sz) { +static void append_payload_vec(struct kdbus_msg_item **d, const void *p, size_t sz) { assert(d); assert(p); assert(sz > 0); *d = ALIGN8_PTR(*d); - (*d)->size = offsetof(struct kdbus_msg_data, vec) + sizeof(struct kdbus_vec); + (*d)->size = offsetof(struct kdbus_msg_item, vec) + sizeof(struct kdbus_vec); (*d)->type = KDBUS_MSG_PAYLOAD_VEC; (*d)->vec.address = (uint64_t) p; (*d)->vec.size = sz; - *d = (struct kdbus_msg_data*) ((uint8_t*) *d + (*d)->size); + *d = (struct kdbus_msg_item *) ((uint8_t*) *d + (*d)->size); } -static void append_destination(struct kdbus_msg_data **d, const char *s, size_t length) { +static void append_destination(struct kdbus_msg_item **d, const char *s, size_t length) { assert(d); assert(s); *d = ALIGN8_PTR(*d); - (*d)->size = offsetof(struct kdbus_msg_data, str) + length + 1; + (*d)->size = offsetof(struct kdbus_msg_item, str) + length + 1; (*d)->type = KDBUS_MSG_DST_NAME; memcpy((*d)->str, s, length + 1); - *d = (struct kdbus_msg_data*) ((uint8_t*) *d + (*d)->size); + *d = (struct kdbus_msg_item *) ((uint8_t*) *d + (*d)->size); } -static void append_bloom(struct kdbus_msg_data **d, const void *p, size_t length) { +static void* append_bloom(struct kdbus_msg_item **d, size_t length) { + void *r; + assert(d); - assert(p); *d = ALIGN8_PTR(*d); - (*d)->size = offsetof(struct kdbus_msg_data, data) + length; + (*d)->size = offsetof(struct kdbus_msg_item, data) + length; (*d)->type = KDBUS_MSG_BLOOM; - memcpy((*d)->data, p, length); + r = (*d)->data; + + *d = (struct kdbus_msg_item *) ((uint8_t*) *d + (*d)->size); + + return r; +} + +static int bus_message_setup_bloom(sd_bus_message *m, void *bloom) { + unsigned i; + int r; + + assert(m); + assert(bloom); + + memset(bloom, 0, BLOOM_SIZE); + + bloom_add_pair(bloom, "message-type", bus_message_type_to_string(m->header->type)); + + if (m->interface) + bloom_add_pair(bloom, "interface", m->interface); + if (m->member) + bloom_add_pair(bloom, "member", m->member); + if (m->path) { + bloom_add_pair(bloom, "path", m->path); + bloom_add_prefixes(bloom, "path-slash-prefix", m->path, '/'); + } + + r = sd_bus_message_rewind(m, true); + if (r < 0) + return r; + + for (i = 0; i < 64; i++) { + char type; + const char *t; + char buf[sizeof("arg")-1 + 2 + sizeof("-slash-prefix")]; + char *e; - *d = (struct kdbus_msg_data*) ((uint8_t*) *d + (*d)->size); + r = sd_bus_message_peek_type(m, &type, NULL); + if (r < 0) + return r; + + if (type != SD_BUS_TYPE_STRING && + type != SD_BUS_TYPE_OBJECT_PATH && + type != SD_BUS_TYPE_SIGNATURE) + break; + + r = sd_bus_message_read_basic(m, type, &t); + if (r < 0) + return r; + + e = stpcpy(buf, "arg"); + if (i < 10) + *(e++) = '0' + i; + else { + *(e++) = '0' + (i / 10); + *(e++) = '0' + (i % 10); + } + + *e = 0; + bloom_add_pair(bloom, buf, t); + + strcpy(e, "-dot-prefix"); + bloom_add_prefixes(bloom, buf, t, '.'); + strcpy(e, "-slash-prefix"); + bloom_add_prefixes(bloom, buf, t, '/'); + } + + return 0; } static int bus_message_setup_kmsg(sd_bus *b, sd_bus_message *m) { - struct kdbus_msg_data *d; + struct kdbus_msg_item *d; bool well_known; uint64_t unique; size_t sz, dl; @@ -116,21 +186,21 @@ static int bus_message_setup_kmsg(sd_bus *b, sd_bus_message *m) { } else well_known = false; - sz = offsetof(struct kdbus_msg, data); + sz = offsetof(struct kdbus_msg, items); /* Add in fixed header, fields header and payload */ - sz += 3 * ALIGN8(offsetof(struct kdbus_msg_data, vec) + sizeof(struct kdbus_vec)); + sz += 3 * ALIGN8(offsetof(struct kdbus_msg_item, vec) + sizeof(struct kdbus_vec)); /* Add space for bloom filter */ - sz += ALIGN8(offsetof(struct kdbus_msg_data, data) + b->bloom_size); + sz += ALIGN8(offsetof(struct kdbus_msg_item, data) + BLOOM_SIZE); /* Add in well-known destination header */ if (well_known) { dl = strlen(m->destination); - sz += ALIGN8(offsetof(struct kdbus_msg_data, str) + dl + 1); + sz += ALIGN8(offsetof(struct kdbus_msg_item, str) + dl + 1); } - m->kdbus = aligned_alloc(8, sz); + m->kdbus = memalign(8, sz); if (!m->kdbus) return -ENOMEM; @@ -147,7 +217,7 @@ static int bus_message_setup_kmsg(sd_bus *b, sd_bus_message *m) { m->kdbus->timeout_ns = m->timeout * NSEC_PER_USEC; - d = m->kdbus->data; + d = m->kdbus->items; if (well_known) append_destination(&d, m->destination, dl); @@ -164,9 +234,13 @@ static int bus_message_setup_kmsg(sd_bus *b, sd_bus_message *m) { void *p; /* For now, let's add a mask all bloom filter */ - p = alloca(b->bloom_size); - memset(p, 0xFF, b->bloom_size); - append_bloom(&d, p, b->bloom_size); + p = append_bloom(&d, BLOOM_SIZE); + r = bus_message_setup_bloom(m, p); + if (r < 0) { + free(m->kdbus); + m->kdbus = NULL; + return -r; + } } m->kdbus->size = (uint8_t*) d - (uint8_t*) m->kdbus; @@ -207,10 +281,12 @@ int bus_kernel_take_fd(sd_bus *b) { hello.conn_flags > 0xFFFFFFFFULL) return -ENOTSUP; + if (hello.bloom_size != BLOOM_SIZE) + return -ENOTSUP; + if (asprintf(&b->unique_name, ":1.%llu", (unsigned long long) hello.id) < 0) return -ENOMEM; - b->bloom_size = hello.bloom_size; b->is_kernel = true; b->bus_client = true; @@ -258,20 +334,20 @@ int bus_kernel_write_message(sd_bus *bus, sd_bus_message *m) { } static void close_kdbus_msg(struct kdbus_msg *k) { - struct kdbus_msg_data *d; + struct kdbus_msg_item *d; - KDBUS_MSG_FOREACH_DATA(d, k) { + KDBUS_ITEM_FOREACH(d, k) { if (d->type != KDBUS_MSG_UNIX_FDS) continue; - close_many(d->fds, (d->size - offsetof(struct kdbus_msg_data, fds)) / sizeof(int)); + close_many(d->fds, (d->size - offsetof(struct kdbus_msg_item, fds)) / sizeof(int)); } } static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k, sd_bus_message **ret) { sd_bus_message *m = NULL; - struct kdbus_msg_data *d; + struct kdbus_msg_item *d; unsigned n_payload = 0, n_fds = 0; _cleanup_free_ int *fds = NULL; struct bus_header *h = NULL; @@ -286,10 +362,10 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k, sd_bus_mess if (k->payload_type != KDBUS_PAYLOAD_DBUS1) return 0; - KDBUS_MSG_FOREACH_DATA(d, k) { + KDBUS_ITEM_FOREACH(d, k) { size_t l; - l = d->size - offsetof(struct kdbus_msg_data, data); + l = d->size - offsetof(struct kdbus_msg_item, data); if (d->type == KDBUS_MSG_PAYLOAD) { @@ -336,10 +412,10 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k, sd_bus_mess if (r < 0) return r; - KDBUS_MSG_FOREACH_DATA(d, k) { + KDBUS_ITEM_FOREACH(d, k) { size_t l; - l = d->size - offsetof(struct kdbus_msg_data, data); + l = d->size - offsetof(struct kdbus_msg_item, data); if (d->type == KDBUS_MSG_PAYLOAD) { @@ -374,7 +450,9 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k, sd_bus_mess else if (d->type == KDBUS_MSG_SRC_CMDLINE) { m->cmdline = d->str; m->cmdline_length = l; - } else + } else if (d->type == KDBUS_MSG_SRC_CGROUP) + m->cgroup = d->str; + else log_debug("Got unknown field from kernel %llu", d->type); } @@ -423,7 +501,7 @@ int bus_kernel_read_message(sd_bus *bus, sd_bus_message **m) { for (;;) { void *q; - q = aligned_alloc(8, sz); + q = memalign(8, sz); if (!q) return -errno; @@ -474,13 +552,14 @@ int bus_kernel_create(const char *name, char **s) { return -errno; l = strlen(name); - make = alloca(offsetof(struct kdbus_cmd_bus_make, name) + DECIMAL_STR_MAX(uid_t) + 1 + l + 1); - memset(make, 0, offsetof(struct kdbus_cmd_bus_make, name)); + make = alloca0(offsetof(struct kdbus_cmd_bus_make, name) + DECIMAL_STR_MAX(uid_t) + 1 + l + 1); sprintf(make->name, "%lu-%s", (unsigned long) getuid(), name); make->size = offsetof(struct kdbus_cmd_bus_make, name) + strlen(make->name) + 1; make->flags = KDBUS_ACCESS_WORLD | KDBUS_POLICY_OPEN; make->bus_flags = 0; - make->bloom_size = 16; + make->bloom_size = BLOOM_SIZE; + make->cgroup_id = 1; + assert_cc(BLOOM_SIZE % 8 == 0); p = strjoin("/dev/kdbus/", make->name, "/bus", NULL); if (!p)