#define KDBUS_ITEM_HEADER_SIZE offsetof(struct kdbus_item, data)
#define KDBUS_ITEM_SIZE(s) ALIGN8((s) + KDBUS_ITEM_HEADER_SIZE)
-#define KDBUS_BUFFER_SIZE (4*1024*1024)
+#define KDBUS_POOL_SIZE (4*1024*1024)
static int parse_unique_name(const char *s, uint64_t *id) {
int r;
(*d)->size = offsetof(struct kdbus_item, vec) + sizeof(struct kdbus_vec);
(*d)->type = KDBUS_MSG_PAYLOAD_VEC;
- (*d)->vec.address = (intptr_t) p;
+ (*d)->vec.address = (uint64_t) p;
(*d)->vec.size = sz;
*d = (struct kdbus_item *) ((uint8_t*) *d + (*d)->size);
}
static int bus_message_setup_kmsg(sd_bus *b, sd_bus_message *m) {
+ struct bus_body_part *part;
struct kdbus_item *d;
bool well_known;
uint64_t unique;
size_t sz, dl;
+ unsigned i;
int r;
assert(b);
sz = offsetof(struct kdbus_msg, items);
/* Add in fixed header, fields header and payload */
- sz += 3 * ALIGN8(offsetof(struct kdbus_item, vec) + sizeof(struct kdbus_vec));
+ sz += (1 + !!m->fields + m->n_body_parts) *
+ ALIGN8(offsetof(struct kdbus_item, vec) + sizeof(struct kdbus_vec));
/* Add space for bloom filter */
sz += ALIGN8(offsetof(struct kdbus_item, data) + BLOOM_SIZE);
if (m->fields)
append_payload_vec(&d, m->fields, ALIGN8(m->header->fields_size));
- if (m->body)
- append_payload_vec(&d, m->body, m->header->body_size);
+ MESSAGE_FOREACH_PART(part, i, m)
+ append_payload_vec(&d, part->data, part->size);
if (m->kdbus->dst_id == KDBUS_DST_ID_BROADCAST) {
void *p;
return -EINVAL;
if (!b->kdbus_buffer) {
- b->kdbus_buffer = mmap(NULL, KDBUS_BUFFER_SIZE, PROT_READ|PROT_WRITE, MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
+ b->kdbus_buffer = mmap(NULL, KDBUS_POOL_SIZE, PROT_READ|PROT_WRITE, MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
if (b->kdbus_buffer == MAP_FAILED) {
b->kdbus_buffer = NULL;
return -errno;
KDBUS_HELLO_ATTACH_SECLABEL|
KDBUS_HELLO_ATTACH_AUDIT;
- hello->items[0].type = KDBUS_HELLO_BUFFER;
+ hello->items[0].type = KDBUS_HELLO_POOL;
hello->items[0].size = KDBUS_ITEM_HEADER_SIZE + sizeof(struct kdbus_vec);
hello->items[0].vec.address = (uint64_t) b->kdbus_buffer;
- hello->items[0].vec.size = KDBUS_BUFFER_SIZE;
+ hello->items[0].vec.size = KDBUS_POOL_SIZE;
r = ioctl(b->input_fd, KDBUS_CMD_HELLO, hello);
if (r < 0)
}
}
-static bool range_contains(size_t astart, size_t asize, size_t bstart, size_t bsize, void *a, void **b) {
+static bool range_contains(
+ size_t astart, size_t asize,
+ size_t bstart, size_t bsize,
+ void *a, void **b) {
if (bstart < astart)
return false;
if (d->vec.size < sizeof(struct bus_header))
return -EBADMSG;
- h = (struct bus_header*) d->vec.address;
+ h = UINT64_TO_PTR(d->vec.address);
}
n_payload++;
if (n_bytes != total)
return -EBADMSG;
- if (n_payload > 2)
- return -EBADMSG;
-
r = bus_message_from_header(h, sizeof(struct bus_header), fds, n_fds, NULL, seclabel, 0, &m);
if (r < 0)
return r;
l = d->size - offsetof(struct kdbus_item, data);
if (d->type == KDBUS_MSG_PAYLOAD_VEC) {
+ size_t begin_body;
+
+ /* Fill in fields material */
+ range_contains(idx, d->vec.size, ALIGN8(sizeof(struct bus_header)), BUS_MESSAGE_FIELDS_SIZE(m),
+ UINT64_TO_PTR(d->vec.address), &m->fields);
+
+ begin_body = ALIGN8(sizeof(struct bus_header)) + ALIGN8(BUS_MESSAGE_FIELDS_SIZE(m));
+
+ if (idx + d->vec.size > begin_body) {
+ struct bus_body_part *part;
- range_contains(idx, d->vec.size, ALIGN8(sizeof(struct bus_header)), BUS_MESSAGE_FIELDS_SIZE(m), (void*) d->vec.address, &m->fields);
- range_contains(idx, d->vec.size, ALIGN8(sizeof(struct bus_header)) + ALIGN8(BUS_MESSAGE_FIELDS_SIZE(m)), BUS_MESSAGE_BODY_SIZE(m), (void*) d->vec.address, &m->body);
+ /* Contains body material */
+
+ part = message_append_part(m);
+ if (!part) {
+ sd_bus_message_unref(m);
+ return -ENOMEM;
+ }
+
+ if (idx >= begin_body) {
+ part->data = (void*) d->vec.address;
+ part->size = d->vec.size;
+ } else {
+ part->data = (uint8_t*) (uintptr_t) d->vec.address + (begin_body - idx);
+ part->size = d->vec.size - (begin_body - idx);
+ }
+
+ part->sealed = true;
+ }
idx += d->vec.size;
log_debug("Got unknown field from kernel %llu", d->type);
}
- if ((BUS_MESSAGE_FIELDS_SIZE(m) > 0 && !m->fields) ||
- (BUS_MESSAGE_BODY_SIZE(m) > 0 && !m->body)) {
+ if ((BUS_MESSAGE_FIELDS_SIZE(m) > 0 && !m->fields)) {
sd_bus_message_unref(m);
return -EBADMSG;
}
n->size = KDBUS_ITEM_HEADER_SIZE + strlen(n->str) + 1;
make->size = offsetof(struct kdbus_cmd_bus_make, items) + cg->size + n->size;
- make->flags = KDBUS_MAKE_ACCESS_WORLD | KDBUS_MAKE_POLICY_OPEN;
+ make->flags = KDBUS_MAKE_POLICY_OPEN;
make->bus_flags = 0;
make->bloom_size = BLOOM_SIZE;
assert_cc(BLOOM_SIZE % 8 == 0);
return fd;
}
+
+int bus_kernel_pop_memfd(sd_bus *bus, void **address, size_t *size) {
+ struct memfd_cache *c;
+
+ assert(address);
+ assert(size);
+
+ if (!bus || !bus->is_kernel)
+ return -ENOTSUP;
+
+ if (bus->n_memfd_cache <= 0) {
+ int fd, r;
+
+ r = ioctl(bus->input_fd, KDBUS_CMD_MEMFD_NEW, &fd);
+ if (r < 0)
+ return -errno;
+
+ *address = NULL;
+ *size = 0;
+ return fd;
+ }
+
+ c = &bus->memfd_cache[-- bus->n_memfd_cache];
+
+ assert(c->fd >= 0);
+ assert(c->size == 0 || c->address);
+
+ *address = c->address;
+ *size = c->size;
+
+ return c->fd;
+}
+
+void bus_kernel_push_memfd(sd_bus *bus, int fd, void *address, size_t size) {
+ struct memfd_cache *c;
+
+ assert(fd >= 0);
+ assert(size == 0 || address);
+
+ if (!bus || !bus->is_kernel ||
+ bus->n_memfd_cache >= ELEMENTSOF(bus->memfd_cache)) {
+
+ if (size > 0)
+ assert_se(munmap(address, PAGE_ALIGN(size)) == 0);
+
+ close_nointr_nofail(fd);
+ return;
+ }
+
+ c = &bus->memfd_cache[bus->n_memfd_cache++];
+ c->fd = fd;
+ c->address = address;
+
+ /* If overly long, let's return a bit to the OS */
+ if (size > MEMFD_CACHE_ITEM_SIZE_MAX) {
+ uint64_t sz = MEMFD_CACHE_ITEM_SIZE_MAX;
+
+ ioctl(bus->input_fd, KDBUS_CMD_MEMFD_SIZE_SET, &sz);
+
+ c->size = MEMFD_CACHE_ITEM_SIZE_MAX;
+ } else
+ c->size = size;
+}
+
+void bus_kernel_flush_memfd(sd_bus *b) {
+ unsigned i;
+
+ assert(b);
+
+ for (i = 0; i < b->n_memfd_cache; i++) {
+ if (b->memfd_cache[i].size > 0)
+ assert_se(munmap(b->memfd_cache[i].address, PAGE_ALIGN(b->memfd_cache[i].size)) == 0);
+
+ close_nointr_nofail(b->memfd_cache[i].fd);
+ }
+}