#include <fcntl.h>
#include <malloc.h>
-#include <libgen.h>
#include <sys/mman.h>
#include <sys/prctl.h>
+/* 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 <libgen.h>
+#undef basename
+
#include "util.h"
#include "strv.h"
#include "memfd-util.h"
+#include "capability.h"
#include "cgroup-util.h"
#include "fileio.h"
m->kdbus->flags =
((m->header->flags & BUS_MESSAGE_NO_REPLY_EXPECTED) ? 0 : KDBUS_MSG_EXPECT_REPLY) |
- ((m->header->flags & BUS_MESSAGE_NO_AUTO_START) ? KDBUS_MSG_NO_AUTO_START : 0);
+ ((m->header->flags & BUS_MESSAGE_NO_AUTO_START) ? KDBUS_MSG_NO_AUTO_START : 0) |
+ ((m->header->type == SD_BUS_MESSAGE_SIGNAL) ? KDBUS_MSG_SIGNAL : 0);
if (well_known)
/* verify_destination_id will usually be 0, which makes the kernel driver only look
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)
append_payload_vec(&d, part->data, part->size);
}
- if (m->kdbus->dst_id == KDBUS_DST_ID_BROADCAST) {
+ if (m->header->type == SD_BUS_MESSAGE_SIGNAL) {
struct kdbus_bloom_filter *bloom;
bloom = append_bloom(&d, m->bus->bloom_size);
return r;
}
-static void bus_message_set_sender_driver(sd_bus *bus, sd_bus_message *m) {
- assert(bus);
- assert(m);
-
- m->sender = m->creds.unique_name = (char*) "org.freedesktop.DBus";
- m->creds.well_known_names_driver = true;
- m->creds.mask |= (SD_BUS_CREDS_UNIQUE_NAME|SD_BUS_CREDS_WELL_KNOWN_NAMES) & bus->creds_mask;
-}
-
static void unset_memfds(struct sd_bus_message *m) {
struct bus_body_part *part;
unsigned i;
part->memfd = -1;
}
+static void message_set_timestamp(sd_bus *bus, sd_bus_message *m, const struct kdbus_timestamp *ts) {
+ assert(bus);
+ assert(m);
+
+ if (!ts)
+ return;
+
+ if (!(bus->attach_flags & KDBUS_ATTACH_TIMESTAMP))
+ return;
+
+ m->realtime = ts->realtime_ns / NSEC_PER_USEC;
+ m->monotonic = ts->monotonic_ns / NSEC_PER_USEC;
+ m->seqnum = ts->seqnum;
+}
+
static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k) {
sd_bus_message *m = NULL;
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);
switch (d->type) {
case KDBUS_ITEM_PAYLOAD_OFF:
- if (!h) {
- h = (struct bus_header *)((uint8_t *)bus->kdbus_buffer + 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: {
}
}
- 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;
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);
}
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;
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;
break;
case KDBUS_ITEM_TIMESTAMP:
-
- if (bus->attach_flags & KDBUS_ATTACH_TIMESTAMP) {
- m->realtime = d->timestamp.realtime_ns / NSEC_PER_USEC;
- m->monotonic = d->timestamp.monotonic_ns / NSEC_PER_USEC;
- m->seqnum = d->timestamp.seqnum;
- }
-
+ message_set_timestamp(bus, m, &d->timestamp);
break;
case KDBUS_ITEM_PID_COMM:
goto fail;
m->creds.cgroup_root = bus->cgroup_root;
-
break;
case KDBUS_ITEM_AUDIT:
break;
case KDBUS_ITEM_CAPS:
- m->creds.capability = (uint8_t *) d->caps.caps;
- m->creds.capability_size = d->size - offsetof(struct kdbus_item, caps.caps);
+ if (d->caps.last_cap != cap_last_cap() ||
+ d->size - offsetof(struct kdbus_item, caps.caps) < DIV_ROUND_UP(d->caps.last_cap, 32U) * 4 * 4) {
+ r = -EBADMSG;
+ goto fail;
+ }
+
+ m->creds.capability = d->caps.caps;
m->creds.mask |= (SD_BUS_CREDS_EFFECTIVE_CAPS|SD_BUS_CREDS_PERMITTED_CAPS|SD_BUS_CREDS_INHERITABLE_CAPS|SD_BUS_CREDS_BOUNDING_CAPS) & bus->creds_mask;
break;
/* If we requested the list of well-known names to be appended
* and the sender had none no item for it will be
- * attached. However, this does *not* mean that we the kernel
+ * attached. However, this does *not* mean that the kernel
* didn't want to provide this information to us. Hence, let's
* explicitly mark this information as available if it was
* requested. */
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;
}
}
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;
/* 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;
}
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;
/* Anybody can send us invalid messages, let's just drop them. */
if (r == -EBADMSG || r == -EPROTOTYPE)
- log_debug_errno(r, "Ignoring invalid message: %m");
+ log_debug_errno(r, "Ignoring invalid synchronous reply: %m");
else
return r;
}
return 1;
}
-static int push_name_owner_changed(sd_bus *bus, const char *name, const char *old_owner, const char *new_owner) {
+static int push_name_owner_changed(
+ sd_bus *bus,
+ const char *name,
+ const char *old_owner,
+ const char *new_owner,
+ const struct kdbus_timestamp *ts) {
+
_cleanup_bus_message_unref_ sd_bus_message *m = NULL;
int r;
return r;
bus_message_set_sender_driver(bus, m);
+ message_set_timestamp(bus, m, ts);
r = bus_seal_synthetic_message(bus, m);
if (r < 0)
return 1;
}
-static int translate_name_change(sd_bus *bus, struct kdbus_msg *k, struct kdbus_item *d) {
+static int translate_name_change(
+ sd_bus *bus,
+ const struct kdbus_msg *k,
+ const struct kdbus_item *d,
+ const struct kdbus_timestamp *ts) {
+
char new_owner[UNIQUE_NAME_MAX], old_owner[UNIQUE_NAME_MAX];
assert(bus);
} else
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);
+ return push_name_owner_changed(bus, d->name_change.name, old_owner, new_owner, ts);
}
-static int translate_id_change(sd_bus *bus, struct kdbus_msg *k, struct kdbus_item *d) {
+static int translate_id_change(
+ sd_bus *bus,
+ const struct kdbus_msg *k,
+ const struct kdbus_item *d,
+ const struct kdbus_timestamp *ts) {
+
char owner[UNIQUE_NAME_MAX];
assert(bus);
return push_name_owner_changed(
bus, owner,
d->type == KDBUS_ITEM_ID_ADD ? NULL : owner,
- d->type == KDBUS_ITEM_ID_ADD ? owner : NULL);
+ d->type == KDBUS_ITEM_ID_ADD ? owner : NULL,
+ ts);
}
-static int translate_reply(sd_bus *bus, struct kdbus_msg *k, struct kdbus_item *d) {
+static int translate_reply(
+ sd_bus *bus,
+ const struct kdbus_msg *k,
+ const struct kdbus_item *d,
+ const struct kdbus_timestamp *ts) {
+
_cleanup_bus_message_unref_ sd_bus_message *m = NULL;
int r;
if (r < 0)
return r;
- bus_message_set_sender_driver(bus, m);
+ message_set_timestamp(bus, m, ts);
r = bus_seal_synthetic_message(bus, m);
if (r < 0)
}
static int bus_kernel_translate_message(sd_bus *bus, struct kdbus_msg *k) {
- struct kdbus_item *d, *found = NULL;
-
- static int (* const translate[])(sd_bus *bus, struct kdbus_msg *k, struct kdbus_item *d) = {
+ static int (* const translate[])(sd_bus *bus, const struct kdbus_msg *k, const struct kdbus_item *d, const struct kdbus_timestamp *ts) = {
[KDBUS_ITEM_NAME_ADD - _KDBUS_ITEM_KERNEL_BASE] = translate_name_change,
[KDBUS_ITEM_NAME_REMOVE - _KDBUS_ITEM_KERNEL_BASE] = translate_name_change,
[KDBUS_ITEM_NAME_CHANGE - _KDBUS_ITEM_KERNEL_BASE] = translate_name_change,
[KDBUS_ITEM_REPLY_DEAD - _KDBUS_ITEM_KERNEL_BASE] = translate_reply,
};
+ struct kdbus_item *d, *found = NULL;
+ struct kdbus_timestamp *ts = NULL;
+
assert(bus);
assert(k);
assert(k->payload_type == KDBUS_PAYLOAD_KERNEL);
KDBUS_ITEM_FOREACH(d, k, items) {
if (d->type == KDBUS_ITEM_TIMESTAMP)
- continue;
+ ts = &d->timestamp;
if (d->type >= _KDBUS_ITEM_KERNEL_BASE && d->type < _KDBUS_ITEM_KERNEL_BASE + ELEMENTSOF(translate)) {
if (found)
return 0;
}
- return translate[found->type - _KDBUS_ITEM_KERNEL_BASE](bus, k, found);
+ return translate[found->type - _KDBUS_ITEM_KERNEL_BASE](bus, k, found, ts);
}
int bus_kernel_read_message(sd_bus *bus, bool hint_priority, int64_t priority) {
}
r = ioctl(bus->input_fd, KDBUS_CMD_RECV, &recv);
+ if (recv.return_flags & KDBUS_RECV_RETURN_DROPPED_MSGS)
+ log_debug("%s: kdbus reports %" PRIu64 " dropped broadcast messages, ignoring.", strna(bus->description), (uint64_t) recv.dropped_msgs);
if (r < 0) {
if (errno == EAGAIN)
return 0;
- if (errno == EOVERFLOW) {
- log_debug("%s: kdbus reports %" PRIu64 " dropped broadcast messages, ignoring.", strna(bus->description), (uint64_t) recv.dropped_msgs);
- return 0;
- }
-
return -errno;
}
- k = (struct kdbus_msg *)((uint8_t *)bus->kdbus_buffer + recv.reply.offset);
+ k = (struct kdbus_msg *)((uint8_t *)bus->kdbus_buffer + recv.msg.offset);
if (k->payload_type == KDBUS_PAYLOAD_DBUS) {
r = bus_kernel_make_message(bus, k);
}
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;
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;
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;
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;
}
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;
}
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);
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;
/* By default we don't want any kdbus metadata fields to be
* suppressed, hence we reset the kernel mask for it to
- * (uint64_t) -1. This is overridable via a kernel command
- * line option, however. */
+ * (uint64_t) -1. If the module argument was overwritten by
+ * the kernel cmdline, we leave it as is. */
- r = get_proc_cmdline_key("systemd.kdbus_attach_flags_mask=", &mask);
+ r = get_proc_cmdline_key("kdbus.attach_flags_mask=", &mask);
if (r < 0)
return log_warning_errno(r, "Failed to read kernel command line: %m");
- if (mask) {
- const char *p = mask;
-
- if (startswith(p, "0x"))
- p += 2;
-
- if (sscanf(p, "%" PRIx64, &m) != 1)
- log_warning("Couldn't parse systemd.kdbus_attach_flags_mask= kernel command line parameter.");
+ if (r == 0) {
+ sprintf(buf, "0x%" PRIx64 "\n", m);
+ r = write_string_file("/sys/module/kdbus/parameters/attach_flags_mask", buf);
+ if (r < 0)
+ return log_full_errno(IN_SET(r, -ENOENT, -EROFS) ? LOG_DEBUG : LOG_WARNING, r,
+ "Failed to write kdbus attach mask: %m");
}
- sprintf(buf, "0x%" PRIx64 "\n", m);
- r = write_string_file("/sys/module/kdbus/parameters/attach_flags_mask", buf);
- if (r < 0)
- return log_full_errno(
- IN_SET(r, -ENOENT, -EROFS) ? LOG_DEBUG : LOG_WARNING, r,
- "Failed to write kdbus attach mask: %m");
-
return 0;
}
~ianmdlvl / elogind.git / blobdiff