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=a8579c98fa80fa67b8ef532d9448db118f7e5d66;hp=d2fcfd7f928e38780053e31be826f408d002eeb0;hb=7adc46fcce257fcf4c83faa18b8c78f2a577e4f1;hpb=c58dea190c4cc66330942ccb7a9d485ff45504d3 diff --git a/src/libsystemd-bus/bus-kernel.c b/src/libsystemd-bus/bus-kernel.c index d2fcfd7f9..a8579c98f 100644 --- a/src/libsystemd-bus/bus-kernel.c +++ b/src/libsystemd-bus/bus-kernel.c @@ -33,6 +33,9 @@ #include "bus-message.h" #include "bus-kernel.h" #include "bus-bloom.h" +#include "bus-util.h" + +#define UNIQUE_NAME_MAX (3+DECIMAL_STR_MAX(uint64_t)) int bus_kernel_parse_unique_name(const char *s, uint64_t *id) { int r; @@ -61,7 +64,7 @@ static void append_payload_vec(struct kdbus_item **d, const void *p, size_t sz) * conditions */ (*d)->size = offsetof(struct kdbus_item, vec) + sizeof(struct kdbus_vec); - (*d)->type = KDBUS_MSG_PAYLOAD_VEC; + (*d)->type = KDBUS_ITEM_PAYLOAD_VEC; (*d)->vec.address = PTR_TO_UINT64(p); (*d)->vec.size = sz; @@ -75,7 +78,7 @@ static void append_payload_memfd(struct kdbus_item **d, int memfd, size_t sz) { *d = ALIGN8_PTR(*d); (*d)->size = offsetof(struct kdbus_item, memfd) + sizeof(struct kdbus_memfd); - (*d)->type = KDBUS_MSG_PAYLOAD_MEMFD; + (*d)->type = KDBUS_ITEM_PAYLOAD_MEMFD; (*d)->memfd.fd = memfd; (*d)->memfd.size = sz; @@ -89,7 +92,7 @@ static void append_destination(struct kdbus_item **d, const char *s, size_t leng *d = ALIGN8_PTR(*d); (*d)->size = offsetof(struct kdbus_item, str) + length + 1; - (*d)->type = KDBUS_MSG_DST_NAME; + (*d)->type = KDBUS_ITEM_DST_NAME; memcpy((*d)->str, s, length + 1); *d = (struct kdbus_item *) ((uint8_t*) *d + (*d)->size); @@ -103,7 +106,7 @@ static void* append_bloom(struct kdbus_item **d, size_t length) { *d = ALIGN8_PTR(*d); (*d)->size = offsetof(struct kdbus_item, data) + length; - (*d)->type = KDBUS_MSG_BLOOM; + (*d)->type = KDBUS_ITEM_BLOOM; r = (*d)->data; *d = (struct kdbus_item *) ((uint8_t*) *d + (*d)->size); @@ -118,7 +121,7 @@ static void append_fds(struct kdbus_item **d, const int fds[], unsigned n_fds) { *d = ALIGN8_PTR(*d); (*d)->size = offsetof(struct kdbus_item, fds) + sizeof(int) * n_fds; - (*d)->type = KDBUS_MSG_FDS; + (*d)->type = KDBUS_ITEM_FDS; memcpy((*d)->fds, fds, sizeof(int) * n_fds); *d = (struct kdbus_item *) ((uint8_t*) *d + (*d)->size); @@ -353,6 +356,8 @@ int bus_kernel_take_fd(sd_bus *b) { if (asprintf(&b->unique_name, ":1.%llu", (unsigned long long) hello.id) < 0) return -ENOMEM; + b->unique_id = hello.id; + b->is_kernel = true; b->bus_client = true; b->can_fds = !!(hello.conn_flags & KDBUS_HELLO_ACCEPT_FD); @@ -360,11 +365,7 @@ int bus_kernel_take_fd(sd_bus *b) { /* the kernel told us the UUID of the underlying bus */ memcpy(b->server_id.bytes, hello.id128, sizeof(b->server_id.bytes)); - r = bus_start_running(b); - if (r < 0) - return r; - - return 1; + return bus_start_running(b); } int bus_kernel_connect(sd_bus *b) { @@ -415,14 +416,182 @@ static void close_kdbus_msg(sd_bus *bus, struct kdbus_msg *k) { KDBUS_PART_FOREACH(d, k, items) { - if (d->type == KDBUS_MSG_FDS) + if (d->type == KDBUS_ITEM_FDS) close_many(d->fds, (d->size - offsetof(struct kdbus_item, fds)) / sizeof(int)); - else if (d->type == KDBUS_MSG_PAYLOAD_MEMFD) + else if (d->type == KDBUS_ITEM_PAYLOAD_MEMFD) close_nointr_nofail(d->memfd.fd); } } -static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k, sd_bus_message **ret) { +static int push_name_owner_changed(sd_bus *bus, const char *name, const char *old_owner, const char *new_owner) { + _cleanup_bus_message_unref_ sd_bus_message *m = NULL; + int r; + + assert(bus); + + r = sd_bus_message_new_signal( + bus, + "/org/freedesktop/DBus", + "org.freedesktop.DBus", + "NameOwnerChanged", + &m); + if (r < 0) + return r; + + r = sd_bus_message_append(m, "sss", name, old_owner, new_owner); + if (r < 0) + return r; + + m->sender = "org.freedesktop.DBus"; + + r = bus_seal_synthetic_message(bus, m); + if (r < 0) + return r; + + bus->rqueue[bus->rqueue_size++] = m; + m = NULL; + + return 1; +} + +static int translate_name_change(sd_bus *bus, struct kdbus_msg *k, struct kdbus_item *d) { + char new_owner[UNIQUE_NAME_MAX], old_owner[UNIQUE_NAME_MAX]; + + assert(bus); + assert(k); + assert(d); + + if (d->name_change.flags != 0) + return 0; + + if (d->type == KDBUS_ITEM_NAME_ADD) + old_owner[0] = 0; + else + sprintf(old_owner, ":1.%llu", (unsigned long long) d->name_change.old_id); + + if (d->type == KDBUS_ITEM_NAME_REMOVE) + new_owner[0] = 0; + else + sprintf(new_owner, ":1.%llu", (unsigned long long) d->name_change.new_id); + + return push_name_owner_changed(bus, d->name_change.name, old_owner, new_owner); +} + +static int translate_id_change(sd_bus *bus, struct kdbus_msg *k, struct kdbus_item *d) { + char owner[UNIQUE_NAME_MAX]; + + assert(bus); + assert(k); + assert(d); + + sprintf(owner, ":1.%llu", d->id_change.id); + + return push_name_owner_changed( + bus, owner, + d->type == KDBUS_ITEM_ID_ADD ? NULL : owner, + d->type == KDBUS_ITEM_ID_ADD ? owner : NULL); +} + +static int translate_reply(sd_bus *bus, struct kdbus_msg *k, struct kdbus_item *d) { + _cleanup_bus_message_unref_ sd_bus_message *m = NULL; + int r; + + assert(bus); + assert(k); + assert(d); + + r = bus_message_new_synthetic_error( + bus, + k->cookie_reply, + d->type == KDBUS_ITEM_REPLY_TIMEOUT ? + &SD_BUS_ERROR_MAKE_CONST(SD_BUS_ERROR_NO_REPLY, "Method call timed out") : + &SD_BUS_ERROR_MAKE_CONST(SD_BUS_ERROR_NO_REPLY, "Method call peer died"), + &m); + if (r < 0) + return r; + + m->sender = "org.freedesktop.DBus"; + + r = bus_seal_synthetic_message(bus, m); + if (r < 0) + return r; + + bus->rqueue[bus->rqueue_size++] = m; + m = NULL; + + return 1; +} + +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) = { + [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_ID_ADD - _KDBUS_ITEM_KERNEL_BASE] = translate_id_change, + [KDBUS_ITEM_ID_REMOVE - _KDBUS_ITEM_KERNEL_BASE] = translate_id_change, + + [KDBUS_ITEM_REPLY_TIMEOUT - _KDBUS_ITEM_KERNEL_BASE] = translate_reply, + [KDBUS_ITEM_REPLY_DEAD - _KDBUS_ITEM_KERNEL_BASE] = translate_reply, + }; + + assert(bus); + assert(k); + assert(k->payload_type == KDBUS_PAYLOAD_KERNEL); + + KDBUS_PART_FOREACH(d, k, items) { + if (d->type >= _KDBUS_ITEM_KERNEL_BASE && d->type < _KDBUS_ITEM_KERNEL_BASE + ELEMENTSOF(translate)) { + if (found) + return -EBADMSG; + found = d; + } else + log_debug("Got unknown field from kernel %llu", d->type); + } + + if (!found) { + log_debug("Didn't find a kernel message to translate."); + return 0; + } + + return translate[found->type - _KDBUS_ITEM_KERNEL_BASE](bus, k, found); +} + +int kdbus_translate_attach_flags(uint64_t mask, uint64_t *kdbus_mask) { + + uint64_t m = 0; + + SET_FLAG(m, KDBUS_ATTACH_CREDS, + !!(mask & (SD_BUS_CREDS_UID|SD_BUS_CREDS_GID|SD_BUS_CREDS_PID|SD_BUS_CREDS_PID_STARTTIME|SD_BUS_CREDS_TID))); + + SET_FLAG(m, KDBUS_ATTACH_COMM, + !!(mask & (SD_BUS_CREDS_COMM|SD_BUS_CREDS_TID_COMM))); + + SET_FLAG(m, KDBUS_ATTACH_EXE, + !!(mask & SD_BUS_CREDS_EXE)); + + SET_FLAG(m, KDBUS_ATTACH_CMDLINE, + !!(mask & SD_BUS_CREDS_CMDLINE)); + + SET_FLAG(m, KDBUS_ATTACH_CGROUP, + !!(mask & (SD_BUS_CREDS_CGROUP|SD_BUS_CREDS_UNIT|SD_BUS_CREDS_USER_UNIT|SD_BUS_CREDS_SLICE|SD_BUS_CREDS_SESSION|SD_BUS_CREDS_OWNER_UID))); + + SET_FLAG(m, KDBUS_ATTACH_CAPS, + !!(mask & (SD_BUS_CREDS_EFFECTIVE_CAPS|SD_BUS_CREDS_PERMITTED_CAPS|SD_BUS_CREDS_INHERITABLE_CAPS|SD_BUS_CREDS_BOUNDING_CAPS))); + + SET_FLAG(m, KDBUS_ATTACH_SECLABEL, + !!(mask & SD_BUS_CREDS_SELINUX_CONTEXT)); + + SET_FLAG(m, KDBUS_ATTACH_AUDIT, + !!(mask & (SD_BUS_CREDS_AUDIT_SESSION_ID|SD_BUS_CREDS_AUDIT_LOGIN_UID))); + + *kdbus_mask = m; + + return 0; +} + +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; @@ -434,18 +603,16 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k, sd_bus_mess assert(bus); assert(k); - assert(ret); - - if (k->payload_type != KDBUS_PAYLOAD_DBUS1) - return 0; + assert(k->payload_type == KDBUS_PAYLOAD_DBUS1); KDBUS_PART_FOREACH(d, k, items) { size_t l; l = d->size - offsetof(struct kdbus_item, data); - if (d->type == KDBUS_MSG_PAYLOAD_OFF) { + switch (d->type) { + case KDBUS_ITEM_PAYLOAD_OFF: if (!h) { h = (struct bus_header *)((uint8_t *)bus->kdbus_buffer + d->vec.offset); @@ -454,15 +621,16 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k, sd_bus_mess } n_bytes += d->vec.size; + break; - } else if (d->type == KDBUS_MSG_PAYLOAD_MEMFD) { - + case KDBUS_ITEM_PAYLOAD_MEMFD: if (!h) return -EBADMSG; n_bytes += d->memfd.size; + break; - } else if (d->type == KDBUS_MSG_FDS) { + case KDBUS_ITEM_FDS: { int *f; unsigned j; @@ -474,9 +642,13 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k, sd_bus_mess fds = f; memcpy(fds + n_fds, d->fds, sizeof(int) * j); n_fds += j; + break; + } - } else if (d->type == KDBUS_MSG_SRC_SECLABEL) + case KDBUS_ITEM_SECLABEL: seclabel = d->str; + break; + } } if (!h) @@ -498,7 +670,9 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k, sd_bus_mess l = d->size - offsetof(struct kdbus_item, data); - if (d->type == KDBUS_MSG_PAYLOAD_OFF) { + switch (d->type) { + + case KDBUS_ITEM_PAYLOAD_OFF: { size_t begin_body; begin_body = BUS_MESSAGE_BODY_BEGIN(m); @@ -531,7 +705,10 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k, sd_bus_mess } idx += d->vec.size; - } else if (d->type == KDBUS_MSG_PAYLOAD_MEMFD) { + break; + } + + case KDBUS_ITEM_PAYLOAD_MEMFD: { struct bus_body_part *part; if (idx < BUS_MESSAGE_BODY_BEGIN(m)) { @@ -550,56 +727,73 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k, sd_bus_mess part->sealed = true; idx += d->memfd.size; + break; + } - } else if (d->type == KDBUS_MSG_SRC_CREDS) { + case KDBUS_ITEM_CREDS: m->creds.pid_starttime = d->creds.starttime / NSEC_PER_USEC; m->creds.uid = d->creds.uid; m->creds.gid = d->creds.gid; m->creds.pid = d->creds.pid; m->creds.tid = d->creds.tid; m->creds.mask |= (SD_BUS_CREDS_UID|SD_BUS_CREDS_GID|SD_BUS_CREDS_PID|SD_BUS_CREDS_PID_STARTTIME|SD_BUS_CREDS_TID) & bus->creds_mask; + break; - } else if (d->type == KDBUS_MSG_TIMESTAMP) { + case KDBUS_ITEM_TIMESTAMP: m->realtime = d->timestamp.realtime_ns / NSEC_PER_USEC; m->monotonic = d->timestamp.monotonic_ns / NSEC_PER_USEC; + break; - } else if (d->type == KDBUS_MSG_SRC_PID_COMM) { + case KDBUS_ITEM_PID_COMM: m->creds.comm = d->str; m->creds.mask |= SD_BUS_CREDS_COMM & bus->creds_mask; + break; - } else if (d->type == KDBUS_MSG_SRC_TID_COMM) { + case KDBUS_ITEM_TID_COMM: m->creds.tid_comm = d->str; m->creds.mask |= SD_BUS_CREDS_TID_COMM & bus->creds_mask; + break; - } else if (d->type == KDBUS_MSG_SRC_EXE) { + case KDBUS_ITEM_EXE: m->creds.exe = d->str; m->creds.mask |= SD_BUS_CREDS_EXE & bus->creds_mask; + break; - } else if (d->type == KDBUS_MSG_SRC_CMDLINE) { + case KDBUS_ITEM_CMDLINE: m->creds.cmdline = d->str; m->creds.cmdline_length = l; m->creds.mask |= SD_BUS_CREDS_CMDLINE & bus->creds_mask; + break; - } else if (d->type == KDBUS_MSG_SRC_CGROUP) { + case KDBUS_ITEM_CGROUP: m->creds.cgroup = d->str; m->creds.mask |= (SD_BUS_CREDS_CGROUP|SD_BUS_CREDS_UNIT|SD_BUS_CREDS_USER_UNIT|SD_BUS_CREDS_SLICE|SD_BUS_CREDS_SESSION|SD_BUS_CREDS_OWNER_UID) & bus->creds_mask; + break; - } else if (d->type == KDBUS_MSG_SRC_AUDIT) { + case KDBUS_ITEM_AUDIT: m->creds.audit_session_id = d->audit.sessionid; m->creds.audit_login_uid = d->audit.loginuid; m->creds.mask |= (SD_BUS_CREDS_AUDIT_SESSION_ID|SD_BUS_CREDS_AUDIT_LOGIN_UID) & bus->creds_mask; + break; - } else if (d->type == KDBUS_MSG_SRC_CAPS) { + case KDBUS_ITEM_CAPS: m->creds.capability = d->data; m->creds.capability_size = l; 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; - } else if (d->type == KDBUS_MSG_DST_NAME) + case KDBUS_ITEM_DST_NAME: destination = d->str; - else if (d->type != KDBUS_MSG_FDS && - d->type != KDBUS_MSG_SRC_SECLABEL && - d->type != KDBUS_MSG_SRC_NAMES) + break; + + case KDBUS_ITEM_FDS: + case KDBUS_ITEM_SECLABEL: + case KDBUS_ITEM_NAMES: + break; + + default: log_debug("Got unknown field from kernel %llu", d->type); + } } r = bus_message_parse_fields(m); @@ -627,10 +821,10 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k, sd_bus_mess m->kdbus = k; m->release_kdbus = true; m->free_fds = true; - fds = NULL; - *ret = m; + bus->rqueue[bus->rqueue_size++] = m; + return 1; fail: @@ -649,13 +843,16 @@ fail: return r; } -int bus_kernel_read_message(sd_bus *bus, sd_bus_message **m) { - uint64_t off; +int bus_kernel_read_message(sd_bus *bus) { struct kdbus_msg *k; + uint64_t off; int r; assert(bus); - assert(m); + + r = bus_rqueue_make_room(bus); + if (r < 0) + return r; r = ioctl(bus->input_fd, KDBUS_CMD_MSG_RECV, &off); if (r < 0) { @@ -666,7 +863,13 @@ int bus_kernel_read_message(sd_bus *bus, sd_bus_message **m) { } k = (struct kdbus_msg *)((uint8_t *)bus->kdbus_buffer + off); - r = bus_kernel_make_message(bus, k, m); + if (k->payload_type == KDBUS_PAYLOAD_DBUS1) + r = bus_kernel_make_message(bus, k); + else if (k->payload_type == KDBUS_PAYLOAD_KERNEL) + r = bus_kernel_translate_message(bus, k); + else + r = 0; + if (r <= 0) close_kdbus_msg(bus, k); @@ -811,7 +1014,7 @@ void bus_kernel_flush_memfd(sd_bus *b) { close_and_munmap(b->memfd_cache[i].fd, b->memfd_cache[i].address, b->memfd_cache[i].size); } -int sd_bus_kernel_translate_request_name_flags(uint64_t sd_bus_flags, uint64_t *kdbus_flags) { +int kdbus_translate_request_name_flags(uint64_t sd_bus_flags, uint64_t *kdbus_flags) { assert_return(kdbus_flags != NULL, -EINVAL);