diff options
Diffstat (limited to 'src/libsystemd/sd-bus/bus-kernel.c')
| -rw-r--r-- | src/libsystemd/sd-bus/bus-kernel.c | 65 |
1 files changed, 39 insertions, 26 deletions
diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c index bdc770600b..f6ef868e72 100644 --- a/src/libsystemd/sd-bus/bus-kernel.c +++ b/src/libsystemd/sd-bus/bus-kernel.c @@ -314,7 +314,7 @@ static int bus_message_setup_kmsg(sd_bus *b, sd_bus_message *m) { m->kdbus->dst_id = destination ? unique : KDBUS_DST_ID_BROADCAST; m->kdbus->payload_type = KDBUS_PAYLOAD_DBUS; - m->kdbus->cookie = (uint64_t) m->header->serial; + m->kdbus->cookie = m->header->dbus2.cookie; m->kdbus->priority = m->priority; if (m->header->flags & BUS_MESSAGE_NO_REPLY_EXPECTED) @@ -416,9 +416,12 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k) { struct kdbus_item *d; unsigned n_fds = 0; _cleanup_free_ int *fds = NULL; - struct bus_header *h = NULL; - size_t total, n_bytes = 0, idx = 0; + struct bus_header *header = NULL; + void *footer = NULL; + size_t header_size = 0, footer_size = 0; + size_t n_bytes = 0, idx = 0; const char *destination = NULL, *seclabel = NULL; + bool last_was_memfd = false; int r; assert(bus); @@ -433,21 +436,24 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k) { switch (d->type) { case KDBUS_ITEM_PAYLOAD_OFF: - if (!h) { - h = (struct bus_header *)((uint8_t *)k + d->vec.offset); - - if (!bus_header_is_complete(h, d->vec.size)) - return -EBADMSG; + if (!header) { + header = (struct bus_header*)((uint8_t*) k + d->vec.offset); + header_size = d->vec.size; } + footer = (uint8_t*) k + d->vec.offset; + footer_size = d->vec.size; + n_bytes += d->vec.size; + last_was_memfd = false; break; case KDBUS_ITEM_PAYLOAD_MEMFD: - if (!h) + if (!header) /* memfd cannot be first part */ return -EBADMSG; n_bytes += d->memfd.size; + last_was_memfd = true; break; case KDBUS_ITEM_FDS: { @@ -471,23 +477,29 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k) { } } - if (!h) + if (last_was_memfd) /* memfd cannot be last part */ return -EBADMSG; - r = bus_header_message_size(h, &total); - if (r < 0) - return r; + if (!header) + return -EBADMSG; - if (n_bytes != total) + if (header_size < sizeof(struct bus_header)) return -EBADMSG; /* on kdbus we only speak native endian gvariant, never dbus1 * marshalling or reverse endian */ - if (h->version != 2 || - h->endian != BUS_NATIVE_ENDIAN) + if (header->version != 2 || + header->endian != BUS_NATIVE_ENDIAN) return -EPROTOTYPE; - r = bus_message_from_header(bus, h, sizeof(struct bus_header), fds, n_fds, NULL, seclabel, 0, &m); + r = bus_message_from_header( + bus, + header, header_size, + footer, footer_size, + n_bytes, + fds, n_fds, + NULL, + seclabel, 0, &m); if (r < 0) return r; @@ -526,11 +538,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 *)k + 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 *)k + 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); } @@ -567,10 +579,11 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k) { case KDBUS_ITEM_PIDS: /* The PID/TID might be missing, when the data - * is faked by some data bus proxy and it - * lacks that information about the real - * client since SO_PEERCRED is used for - * that. */ + * is faked by a bus proxy and it lacks that + * information about the real client (since + * SO_PEERCRED is used for that). Also kernel + * namespacing might make some of this data + * unavailable when untranslatable. */ if (d->pids.pid > 0) { m->creds.pid = (pid_t) d->pids.pid; @@ -586,7 +599,8 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k) { case KDBUS_ITEM_CREDS: - /* EUID/SUID/FSUID/EGID/SGID/FSGID might be missing too (see above). */ + /* EUID/SUID/FSUID/EGID/SGID/FSGID might be + * missing too (see above). */ if ((uid_t) d->creds.uid != UID_INVALID) { m->creds.uid = (uid_t) d->creds.uid; @@ -664,7 +678,6 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k) { goto fail; m->creds.cgroup_root = bus->cgroup_root; - break; case KDBUS_ITEM_AUDIT: @@ -767,7 +780,7 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k) { goto fail; /* Refuse messages if kdbus and dbus1 cookie doesn't match up */ - if ((uint64_t) m->header->serial != k->cookie) { + if ((uint64_t) m->header->dbus2.cookie != k->cookie) { r = -EBADMSG; goto fail; } |