#include <errno.h>
#include <fcntl.h>
+#include <sys/mman.h>
#include "util.h"
#include "utf8.h"
#include "strv.h"
+#include "time-util.h"
+#include "cgroup-util.h"
#include "sd-bus.h"
#include "bus-message.h"
#include "bus-type.h"
#include "bus-signature.h"
-static int message_parse_fields(sd_bus_message *m);
static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored);
-static void reset_containers(sd_bus_message *m) {
+static void *adjust_pointer(const void *p, void *old_base, size_t sz, void *new_base) {
+
+ if (p == NULL)
+ return NULL;
+
+ if (old_base == new_base)
+ return (void*) p;
+
+ if ((uint8_t*) p < (uint8_t*) old_base)
+ return (void*) p;
+
+ if ((uint8_t*) p >= (uint8_t*) old_base + sz)
+ return (void*) p;
+
+ return (uint8_t*) new_base + ((uint8_t*) p - (uint8_t*) old_base);
+}
+
+static void message_free_part(sd_bus_message *m, struct bus_body_part *part) {
+ assert(m);
+ assert(part);
+
+ if (part->memfd >= 0) {
+ /* If we can reuse the memfd, try that. For that it
+ * can't be sealed yet. */
+
+ if (!part->sealed)
+ bus_kernel_push_memfd(m->bus, part->memfd, part->data, part->mapped);
+ else {
+ if (part->mapped > 0)
+ assert_se(munmap(part->data, part->mapped) == 0);
+
+ close_nointr_nofail(part->memfd);
+ }
+
+ } else if (part->munmap_this)
+ munmap(part->data, part->mapped);
+ else if (part->free_this)
+ free(part->data);
+
+ if (part != &m->body)
+ free(part);
+}
+
+static void message_reset_parts(sd_bus_message *m) {
+ struct bus_body_part *part;
+
+ assert(m);
+
+ part = &m->body;
+ while (m->n_body_parts > 0) {
+ struct bus_body_part *next = part->next;
+ message_free_part(m, part);
+ part = next;
+ m->n_body_parts--;
+ }
+
+ m->body_end = NULL;
+
+ m->cached_rindex_part = NULL;
+ m->cached_rindex_part_begin = 0;
+}
+
+static void message_reset_containers(sd_bus_message *m) {
unsigned i;
assert(m);
if (m->free_header)
free(m->header);
- if (m->free_fields)
- free(m->fields);
+ message_reset_parts(m);
+
+ if (m->free_kdbus)
+ free(m->kdbus);
+
+ if (m->release_kdbus) {
+ uint64_t off;
- if (m->free_body)
- free(m->body);
+ off = (uint8_t *)m->kdbus - (uint8_t *)m->bus->kdbus_buffer;
+ ioctl(m->bus->input_fd, KDBUS_CMD_MSG_RELEASE, &off);
+ }
+
+ if (m->bus)
+ sd_bus_unref(m->bus);
if (m->free_fds) {
close_many(m->fds, m->n_fds);
free(m->fds);
}
- reset_containers(m);
+ if (m->iovec != m->iovec_fixed)
+ free(m->iovec);
+
+ free(m->cmdline_array);
+
+ message_reset_containers(m);
free(m->root_container.signature);
free(m->peeked_signature);
+
+ free(m->unit);
+ free(m->user_unit);
+ free(m->session);
free(m);
}
-static void* buffer_extend(void **p, uint32_t *sz, size_t align, size_t extend) {
- size_t start, n;
- void *k;
-
- assert(p);
- assert(sz);
- assert(align > 0);
-
- start = ALIGN_TO((size_t) *sz, align);
- n = start + extend;
+static void *message_extend_fields(sd_bus_message *m, size_t align, size_t sz) {
+ void *op, *np;
+ size_t old_size, new_size, start;
- if (n == *sz)
- return (uint8_t*) *p + start;
+ assert(m);
- if (n > (size_t) ((uint32_t) -1))
+ if (m->poisoned)
return NULL;
- k = realloc(*p, n);
- if (!k)
- return NULL;
+ old_size = sizeof(struct bus_header) + m->header->fields_size;
+ start = ALIGN_TO(old_size, align);
+ new_size = start + sz;
- /* Zero out padding */
- if (start > *sz)
- memset((uint8_t*) k + *sz, 0, start - *sz);
+ if (old_size == new_size)
+ return (uint8_t*) m->header + old_size;
- *p = k;
- *sz = n;
+ if (new_size > (size_t) ((uint32_t) -1))
+ goto poison;
- return (uint8_t*) k + start;
-}
+ if (m->free_header) {
+ np = realloc(m->header, ALIGN8(new_size));
+ if (!np)
+ goto poison;
+ } else {
+ /* Initially, the header is allocated as part of of
+ * the sd_bus_message itself, let's replace it by
+ * dynamic data */
-static void *message_extend_fields(sd_bus_message *m, size_t align, size_t sz) {
- void *p, *o;
+ np = malloc(ALIGN8(new_size));
+ if (!np)
+ goto poison;
- assert(m);
+ memcpy(np, m->header, sizeof(struct bus_header));
+ }
- o = m->fields;
- p = buffer_extend(&m->fields, &m->header->fields_size, align, sz);
- if (!p)
- return NULL;
+ /* Zero out padding */
+ if (start > old_size)
+ memset((uint8_t*) np + old_size, 0, start - old_size);
- if (o != m->fields) {
- /* Adjust quick access pointers */
+ op = m->header;
+ m->header = np;
+ m->header->fields_size = new_size - sizeof(struct bus_header);
- if (m->path)
- m->path = (const char*) m->fields + (m->path - (const char*) o);
- if (m->interface)
- m->interface = (const char*) m->fields + (m->interface - (const char*) o);
- if (m->member)
- m->member = (const char*) m->fields + (m->member - (const char*) o);
- if (m->destination)
- m->destination = (const char*) m->fields + (m->destination - (const char*) o);
- if (m->sender)
- m->sender = (const char*) m->fields + (m->sender - (const char*) o);
- if (m->error.name)
- m->error.name = (const char*) m->fields + (m->error.name - (const char*) o);
- }
+ /* Adjust quick access pointers */
+ m->path = adjust_pointer(m->path, op, old_size, m->header);
+ m->interface = adjust_pointer(m->interface, op, old_size, m->header);
+ m->member = adjust_pointer(m->member, op, old_size, m->header);
+ m->destination = adjust_pointer(m->destination, op, old_size, m->header);
+ m->sender = adjust_pointer(m->sender, op, old_size, m->header);
+ m->error.name = adjust_pointer(m->error.name, op, old_size, m->header);
- m->free_fields = true;
+ m->free_header = true;
- return p;
+ return (uint8_t*) np + start;
+
+poison:
+ m->poisoned = true;
+ return NULL;
}
static int message_append_field_string(
memcpy(p + 8, s, l + 1);
if (ret)
- *ret = (const char*) p + 8;
+ *ret = (char*) p + 8;
return 0;
}
return 0;
}
-int bus_message_from_malloc(
+int bus_message_from_header(
void *buffer,
size_t length,
int *fds,
unsigned n_fds,
const struct ucred *ucred,
const char *label,
+ size_t extra,
sd_bus_message **ret) {
sd_bus_message *m;
struct bus_header *h;
- size_t total, fs, bs, label_sz, a;
- int r;
+ size_t a, label_sz;
assert(buffer || length <= 0);
assert(fds || n_fds <= 0);
if (h->type == _SD_BUS_MESSAGE_TYPE_INVALID)
return -EBADMSG;
- if (h->endian == SD_BUS_NATIVE_ENDIAN) {
- fs = h->fields_size;
- bs = h->body_size;
- } else if (h->endian == SD_BUS_REVERSE_ENDIAN) {
- fs = bswap_32(h->fields_size);
- bs = bswap_32(h->body_size);
- } else
+ if (h->endian != SD_BUS_LITTLE_ENDIAN &&
+ h->endian != SD_BUS_BIG_ENDIAN)
return -EBADMSG;
- total = sizeof(struct bus_header) + ALIGN8(fs) + bs;
- if (length != total)
- return -EBADMSG;
+ a = ALIGN(sizeof(sd_bus_message)) + ALIGN(extra);
if (label) {
label_sz = strlen(label);
- a = ALIGN(sizeof(sd_bus_message)) + label_sz + 1;
- } else
- a = sizeof(sd_bus_message);
+ a += label_sz + 1;
+ }
m = malloc0(a);
if (!m)
m->n_ref = 1;
m->sealed = true;
m->header = h;
- m->fields = (uint8_t*) buffer + sizeof(struct bus_header);
- m->body = (uint8_t*) buffer + sizeof(struct bus_header) + ALIGN8(fs);
m->fds = fds;
m->n_fds = n_fds;
}
if (label) {
- m->label = (char*) m + ALIGN(sizeof(sd_bus_message));
+ m->label = (char*) m + ALIGN(sizeof(sd_bus_message)) + ALIGN(extra);
memcpy(m->label, label, label_sz + 1);
}
+ *ret = m;
+ return 0;
+}
+
+int bus_message_from_malloc(
+ void *buffer,
+ size_t length,
+ int *fds,
+ unsigned n_fds,
+ const struct ucred *ucred,
+ const char *label,
+ sd_bus_message **ret) {
+
+ sd_bus_message *m;
+ int r;
+
+ r = bus_message_from_header(buffer, length, fds, n_fds, ucred, label, 0, &m);
+ if (r < 0)
+ return r;
+
+ if (length != BUS_MESSAGE_SIZE(m)) {
+ r = -EBADMSG;
+ goto fail;
+ }
+
+ m->n_body_parts = 1;
+ m->body.data = (uint8_t*) buffer + sizeof(struct bus_header) + ALIGN8(BUS_MESSAGE_FIELDS_SIZE(m));
+ m->body.size = length - sizeof(struct bus_header) - ALIGN8(BUS_MESSAGE_FIELDS_SIZE(m));
+ m->body.sealed = true;
+ m->body.memfd = -1;
+
m->n_iovec = 1;
+ m->iovec = m->iovec_fixed;
m->iovec[0].iov_base = buffer;
m->iovec[0].iov_len = length;
- m->size = length;
- r = message_parse_fields(m);
+ r = bus_message_parse_fields(m);
if (r < 0)
goto fail;
m->header->version = bus ? bus->message_version : 1;
m->allow_fds = !bus || bus->can_fds || (bus->state != BUS_HELLO && bus->state != BUS_RUNNING);
+ if (bus)
+ m->bus = sd_bus_ref(bus);
+
return m;
}
sd_bus_message *t;
int r;
- if (!path)
+ if (destination && !service_name_is_valid(destination))
return -EINVAL;
- if (!member)
+ if (!object_path_is_valid(path))
+ return -EINVAL;
+ if (interface && !interface_name_is_valid(interface))
+ return -EINVAL;
+ if (!member_name_is_valid(member))
return -EINVAL;
if (!m)
return -EINVAL;
goto fail;
if (call->sender) {
- r = message_append_field_string(t, SD_BUS_MESSAGE_HEADER_DESTINATION, SD_BUS_TYPE_STRING, call->sender, &t->sender);
+ r = message_append_field_string(t, SD_BUS_MESSAGE_HEADER_DESTINATION, SD_BUS_TYPE_STRING, call->sender, &t->destination);
if (r < 0)
goto fail;
}
return r;
}
+int sd_bus_message_new_method_errorf(
+ sd_bus *bus,
+ sd_bus_message *call,
+ sd_bus_message **m,
+ const char *name,
+ const char *format,
+ ...) {
+
+ _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+ sd_bus_message *t;
+ va_list ap;
+ int r;
+
+ if (!name)
+ return -EINVAL;
+ if (!m)
+ return -EINVAL;
+
+ r = message_new_reply(bus, call, SD_BUS_MESSAGE_TYPE_METHOD_ERROR, &t);
+ if (r < 0)
+ return r;
+
+ r = message_append_field_string(t, SD_BUS_MESSAGE_HEADER_ERROR_NAME, SD_BUS_TYPE_STRING, name, &t->error.name);
+ if (r < 0)
+ goto fail;
+
+ if (format) {
+ _cleanup_free_ char *message = NULL;
+
+ va_start(ap, format);
+ r = vasprintf(&message, format, ap);
+ va_end(ap);
+
+ if (r < 0) {
+ r = -ENOMEM;
+ goto fail;
+ }
+
+ r = message_append_basic(t, SD_BUS_TYPE_STRING, message, (const void**) &t->error.message);
+ if (r < 0)
+ goto fail;
+ }
+
+ *m = t;
+ return 0;
+
+fail:
+ message_free(t);
+ return r;
+}
+
+
+int bus_message_new_synthetic_error(
+ sd_bus *bus,
+ uint64_t serial,
+ const sd_bus_error *e,
+ sd_bus_message **m) {
+
+ sd_bus_message *t;
+ int r;
+
+ assert(sd_bus_error_is_set(e));
+ assert(m);
+
+ t = message_new(bus, SD_BUS_MESSAGE_TYPE_METHOD_ERROR);
+ if (!t)
+ return -ENOMEM;
+
+ t->header->flags |= SD_BUS_MESSAGE_NO_REPLY_EXPECTED;
+ t->reply_serial = serial;
+
+ r = message_append_field_uint32(t, SD_BUS_MESSAGE_HEADER_REPLY_SERIAL, t->reply_serial);
+ if (r < 0)
+ goto fail;
+
+ if (bus && bus->unique_name) {
+ r = message_append_field_string(t, SD_BUS_MESSAGE_HEADER_DESTINATION, SD_BUS_TYPE_STRING, bus->unique_name, &t->destination);
+ if (r < 0)
+ goto fail;
+ }
+
+ *m = t;
+ return 0;
+
+fail:
+ message_free(t);
+ return r;
+}
+
sd_bus_message* sd_bus_message_ref(sd_bus_message *m) {
if (!m)
return NULL;
int sd_bus_message_get_uid(sd_bus_message *m, uid_t *uid) {
if (!m)
return -EINVAL;
+ if (!uid)
+ return -EINVAL;
if (!m->uid_valid)
- return -ENOENT;
+ return -ESRCH;
*uid = m->uid;
return 0;
int sd_bus_message_get_gid(sd_bus_message *m, gid_t *gid) {
if (!m)
return -EINVAL;
+ if (!gid)
+ return -EINVAL;
if (!m->gid_valid)
- return -ENOENT;
+ return -ESRCH;
*gid = m->gid;
return 0;
int sd_bus_message_get_pid(sd_bus_message *m, pid_t *pid) {
if (!m)
return -EINVAL;
+ if (!pid)
+ return -EINVAL;
if (m->pid <= 0)
- return -ENOENT;
+ return -ESRCH;
*pid = m->pid;
return 0;
int sd_bus_message_get_tid(sd_bus_message *m, pid_t *tid) {
if (!m)
return -EINVAL;
+ if (!tid)
+ return -EINVAL;
if (m->tid <= 0)
- return -ENOENT;
+ return -ESRCH;
*tid = m->tid;
return 0;
}
-const char *sd_bus_message_get_label(sd_bus_message *m) {
+int sd_bus_message_get_pid_starttime(sd_bus_message *m, uint64_t *usec) {
if (!m)
- return NULL;
+ return -EINVAL;
+ if (!usec)
+ return -EINVAL;
+ if (m->pid_starttime <= 0)
+ return -ESRCH;
- return m->label;
+ *usec = m->pid_starttime;
+ return 0;
}
-int sd_bus_message_is_signal(sd_bus_message *m, const char *interface, const char *member) {
+int sd_bus_message_get_selinux_context(sd_bus_message *m, const char **ret) {
if (!m)
return -EINVAL;
+ if (!m->label)
+ return -ESRCH;
- if (m->header->type != SD_BUS_MESSAGE_TYPE_SIGNAL)
- return 0;
-
- if (interface && (!m->interface || !streq(m->interface, interface)))
- return 0;
+ *ret = m->label;
+ return 0;
+}
- if (member && (!m->member || !streq(m->member, member)))
- return 0;
+int sd_bus_message_get_monotonic_timestamp(sd_bus_message *m, uint64_t *usec) {
+ if (!m)
+ return -EINVAL;
+ if (!usec)
+ return -EINVAL;
+ if (m->monotonic <= 0)
+ return -ESRCH;
- return 1;
+ *usec = m->monotonic;
+ return 0;
}
-int sd_bus_message_is_method_call(sd_bus_message *m, const char *interface, const char *member) {
+int sd_bus_message_get_realtime_timestamp(sd_bus_message *m, uint64_t *usec) {
if (!m)
return -EINVAL;
+ if (!usec)
+ return -EINVAL;
+ if (m->realtime <= 0)
+ return -ESRCH;
- if (m->header->type != SD_BUS_MESSAGE_TYPE_METHOD_CALL)
- return 0;
-
- if (interface && (!m->interface || !streq(m->interface, interface)))
- return 0;
+ *usec = m->realtime;
+ return 0;
+}
- if (member && (!m->member || !streq(m->member, member)))
- return 0;
+int sd_bus_message_get_comm(sd_bus_message *m, const char **ret) {
+ if (!m)
+ return -EINVAL;
+ if (!ret)
+ return -EINVAL;
+ if (!m->comm)
+ return -ESRCH;
- return 1;
+ *ret = m->comm;
+ return 0;
}
-int sd_bus_message_is_method_error(sd_bus_message *m, const char *name) {
+int sd_bus_message_get_tid_comm(sd_bus_message *m, const char **ret) {
if (!m)
return -EINVAL;
+ if (!ret)
+ return -EINVAL;
+ if (!m->tid_comm)
+ return -ESRCH;
- if (m->header->type != SD_BUS_MESSAGE_TYPE_METHOD_ERROR)
- return 0;
+ *ret = m->tid_comm;
+ return 0;
+}
- if (name && (!m->error.name || !streq(m->error.name, name)))
- return 0;
+int sd_bus_message_get_exe(sd_bus_message *m, const char **ret) {
+ if (!m)
+ return -EINVAL;
+ if (!ret)
+ return -EINVAL;
+ if (!m->exe)
+ return -ESRCH;
- return 1;
+ *ret = m->exe;
+ return 0;
}
-int sd_bus_message_set_no_reply(sd_bus_message *m, int b) {
+int sd_bus_message_get_cgroup(sd_bus_message *m, const char **ret) {
if (!m)
return -EINVAL;
- if (m->sealed)
- return -EPERM;
- if (m->header->type != SD_BUS_MESSAGE_TYPE_METHOD_CALL)
- return -EPERM;
-
- if (b)
- m->header->flags |= SD_BUS_MESSAGE_NO_REPLY_EXPECTED;
- else
- m->header->flags &= ~SD_BUS_MESSAGE_NO_REPLY_EXPECTED;
+ if (!ret)
+ return -EINVAL;
+ if (!m->cgroup)
+ return -ESRCH;
+ *ret = m->cgroup;
return 0;
}
-static struct bus_container *message_get_container(sd_bus_message *m) {
- assert(m);
+int sd_bus_message_get_unit(sd_bus_message *m, const char **ret) {
+ int r;
- if (m->n_containers == 0)
- return &m->root_container;
+ if (!m)
+ return -EINVAL;
+ if (!ret)
+ return -EINVAL;
+ if (!m->cgroup)
+ return -ESRCH;
- assert(m->containers);
- return m->containers + m->n_containers - 1;
+ if (!m->unit) {
+ r = cg_path_get_unit(m->cgroup, &m->unit);
+ if (r < 0)
+ return r;
+ }
+
+ *ret = m->unit;
+ return 0;
}
-static void *message_extend_body(sd_bus_message *m, size_t align, size_t sz) {
- void *p, *o;
- size_t added;
- struct bus_container *c;
+int sd_bus_message_get_user_unit(sd_bus_message *m, const char **ret) {
+ int r;
- assert(m);
- assert(align > 0);
+ if (!m)
+ return -EINVAL;
+ if (!ret)
+ return -EINVAL;
+ if (!m->cgroup)
+ return -ESRCH;
- o = m->body;
- added = m->header->body_size;
+ if (!m->user_unit) {
+ r = cg_path_get_user_unit(m->cgroup, &m->user_unit);
+ if (r < 0)
+ return r;
+ }
- p = buffer_extend(&m->body, &m->header->body_size, align, sz);
- if (!p)
+ *ret = m->user_unit;
+ return 0;
+}
+
+int sd_bus_message_get_session(sd_bus_message *m, const char **ret) {
+ int r;
+
+ if (!m)
+ return -EINVAL;
+ if (!ret)
+ return -EINVAL;
+ if (!m->cgroup)
+ return -ESRCH;
+
+ if (!m->session) {
+ r = cg_path_get_session(m->cgroup, &m->session);
+ if (r < 0)
+ return r;
+ }
+
+ *ret = m->session;
+ return 0;
+}
+
+int sd_bus_message_get_owner_uid(sd_bus_message *m, uid_t *uid) {
+ if (!m)
+ return -EINVAL;
+ if (!uid)
+ return -EINVAL;
+ if (!m->cgroup)
+ return -ESRCH;
+
+ return cg_path_get_owner_uid(m->cgroup, uid);
+}
+
+int sd_bus_message_get_cmdline(sd_bus_message *m, char ***cmdline) {
+ size_t n, i;
+ const char *p;
+ bool first;
+
+ if (!m)
+ return -EINVAL;
+
+ if (!m->cmdline)
+ return -ENOENT;
+
+ for (p = m->cmdline, n = 0; p < m->cmdline + m->cmdline_length; p++)
+ if (*p == 0)
+ n++;
+
+ m->cmdline_array = new(char*, n + 1);
+ if (!m->cmdline_array)
+ return -ENOMEM;
+
+ for (p = m->cmdline, i = 0, first = true; p < m->cmdline + m->cmdline_length; p++) {
+ if (first)
+ m->cmdline_array[i++] = (char*) p;
+
+ first = *p == 0;
+ }
+
+ m->cmdline_array[i] = NULL;
+ *cmdline = m->cmdline_array;
+
+ return 0;
+}
+
+int sd_bus_message_get_audit_sessionid(sd_bus_message *m, uint32_t *sessionid) {
+ if (!m)
+ return -EINVAL;
+ if (!sessionid)
+ return -EINVAL;
+ if (!m->audit)
+ return -ESRCH;
+
+ *sessionid = m->audit->sessionid;
+ return 0;
+}
+
+int sd_bus_message_get_audit_loginuid(sd_bus_message *m, uid_t *uid) {
+ if (!m)
+ return -EINVAL;
+ if (!uid)
+ return -EINVAL;
+ if (!m->audit)
+ return -ESRCH;
+
+ *uid = m->audit->loginuid;
+ return 0;
+}
+
+int sd_bus_message_has_effective_cap(sd_bus_message *m, int capability) {
+ unsigned sz;
+
+ if (!m)
+ return -EINVAL;
+ if (capability < 0)
+ return -EINVAL;
+ if (!m->capability)
+ return -ESRCH;
+
+ sz = m->capability_size / 4;
+ if ((unsigned) capability >= sz*8)
+ return 0;
+
+ return !!(m->capability[2 * sz + (capability / 8)] & (1 << (capability % 8)));
+}
+
+int sd_bus_message_is_signal(sd_bus_message *m, const char *interface, const char *member) {
+ if (!m)
+ return -EINVAL;
+
+ if (m->header->type != SD_BUS_MESSAGE_TYPE_SIGNAL)
+ return 0;
+
+ if (interface && (!m->interface || !streq(m->interface, interface)))
+ return 0;
+
+ if (member && (!m->member || !streq(m->member, member)))
+ return 0;
+
+ return 1;
+}
+
+int sd_bus_message_is_method_call(sd_bus_message *m, const char *interface, const char *member) {
+ if (!m)
+ return -EINVAL;
+
+ if (m->header->type != SD_BUS_MESSAGE_TYPE_METHOD_CALL)
+ return 0;
+
+ if (interface && (!m->interface || !streq(m->interface, interface)))
+ return 0;
+
+ if (member && (!m->member || !streq(m->member, member)))
+ return 0;
+
+ return 1;
+}
+
+int sd_bus_message_is_method_error(sd_bus_message *m, const char *name) {
+ if (!m)
+ return -EINVAL;
+
+ if (m->header->type != SD_BUS_MESSAGE_TYPE_METHOD_ERROR)
+ return 0;
+
+ if (name && (!m->error.name || !streq(m->error.name, name)))
+ return 0;
+
+ return 1;
+}
+
+int sd_bus_message_set_no_reply(sd_bus_message *m, int b) {
+ if (!m)
+ return -EINVAL;
+ if (m->sealed)
+ return -EPERM;
+ if (m->header->type != SD_BUS_MESSAGE_TYPE_METHOD_CALL)
+ return -EPERM;
+
+ if (b)
+ m->header->flags |= SD_BUS_MESSAGE_NO_REPLY_EXPECTED;
+ else
+ m->header->flags &= ~SD_BUS_MESSAGE_NO_REPLY_EXPECTED;
+
+ return 0;
+}
+
+static struct bus_container *message_get_container(sd_bus_message *m) {
+ assert(m);
+
+ if (m->n_containers == 0)
+ return &m->root_container;
+
+ assert(m->containers);
+ return m->containers + m->n_containers - 1;
+}
+
+struct bus_body_part *message_append_part(sd_bus_message *m) {
+ struct bus_body_part *part;
+
+ assert(m);
+
+ if (m->poisoned)
return NULL;
- added = m->header->body_size - added;
+ if (m->n_body_parts <= 0) {
+ part = &m->body;
+ zero(*part);
+ } else {
+ assert(m->body_end);
+
+ part = new0(struct bus_body_part, 1);
+ if (!part) {
+ m->poisoned = true;
+ return NULL;
+ }
+
+ m->body_end->next = part;
+ }
+
+ part->memfd = -1;
+ m->body_end = part;
+ m->n_body_parts ++;
+
+ return part;
+}
+
+static void part_zero(struct bus_body_part *part, size_t sz) {
+ assert(part);
+ assert(sz > 0);
+ assert(sz < 8);
+
+ /* All other fields can be left in their defaults */
+ assert(!part->data);
+ assert(part->memfd < 0);
+
+ part->size = sz;
+ part->is_zero = true;
+ part->sealed = true;
+}
+
+static int part_make_space(
+ struct sd_bus_message *m,
+ struct bus_body_part *part,
+ size_t sz,
+ void **q) {
+
+ void *n;
+ int r;
+
+ assert(m);
+ assert(part);
+ assert(!part->sealed);
+
+ if (m->poisoned)
+ return -ENOMEM;
+
+ if (!part->data && part->memfd < 0)
+ part->memfd = bus_kernel_pop_memfd(m->bus, &part->data, &part->mapped);
+
+ if (part->memfd >= 0) {
+ uint64_t u = sz;
+
+ r = ioctl(part->memfd, KDBUS_CMD_MEMFD_SIZE_SET, &u);
+ if (r < 0) {
+ m->poisoned = true;
+ return -errno;
+ }
+
+ if (!part->data || sz > part->mapped) {
+ size_t psz = PAGE_ALIGN(sz > 0 ? sz : 1);
+
+ if (part->mapped <= 0)
+ n = mmap(NULL, psz, PROT_READ|PROT_WRITE, MAP_SHARED, part->memfd, 0);
+ else
+ n = mremap(part->data, part->mapped, psz, MREMAP_MAYMOVE);
+
+ if (n == MAP_FAILED) {
+ m->poisoned = true;
+ return -errno;
+ }
+
+ part->mapped = psz;
+ part->data = n;
+ }
+
+ part->munmap_this = true;
+ } else {
+ n = realloc(part->data, sz);
+ if (!n) {
+ m->poisoned = true;
+ return -ENOMEM;
+ }
+
+ part->data = n;
+ part->free_this = true;
+ }
+
+ if (q)
+ *q = part->data ? (uint8_t*) part->data + part->size : NULL;
+
+ part->size = sz;
+ return 0;
+}
+
+static void message_extend_containers(sd_bus_message *m, size_t expand) {
+ struct bus_container *c;
+
+ assert(m);
+
+ if (expand <= 0)
+ return;
+ /* Update counters */
for (c = m->containers; c < m->containers + m->n_containers; c++)
- if (c->array_size) {
- c->array_size = (uint32_t*) ((uint8_t*) m->body + ((uint8_t*) c->array_size - (uint8_t*) o));
- *c->array_size += added;
+ if (c->array_size)
+ *c->array_size += expand;
+}
+
+static void *message_extend_body(sd_bus_message *m, size_t align, size_t sz) {
+ struct bus_body_part *part = NULL;
+ size_t start_body, end_body, padding, start_part, end_part, added;
+ bool add_new_part;
+ void *p;
+ int r;
+
+ assert(m);
+ assert(align > 0);
+ assert(!m->sealed);
+
+ if (m->poisoned)
+ return NULL;
+
+ start_body = ALIGN_TO((size_t) m->header->body_size, align);
+ end_body = start_body + sz;
+
+ padding = start_body - m->header->body_size;
+ added = padding + sz;
+
+ /* Check for 32bit overflows */
+ if (end_body > (size_t) ((uint32_t) -1)) {
+ m->poisoned = true;
+ return NULL;
+ }
+
+ add_new_part =
+ m->n_body_parts <= 0 ||
+ m->body_end->sealed ||
+ padding != ALIGN_TO(m->body_end->size, align) - m->body_end->size;
+
+ if (add_new_part) {
+ if (padding > 0) {
+ part = message_append_part(m);
+ if (!part)
+ return NULL;
+
+ part_zero(part, padding);
}
- if (o != m->body) {
- if (m->error.message)
- m->error.message = (const char*) m->body + (m->error.message - (const char*) o);
+ part = message_append_part(m);
+ if (!part)
+ return NULL;
+
+ r = part_make_space(m, part, sz, &p);
+ if (r < 0)
+ return NULL;
+ } else {
+ struct bus_container *c;
+ void *op;
+ size_t os;
+
+ part = m->body_end;
+ op = part->data;
+ os = part->size;
+
+ start_part = ALIGN_TO(part->size, align);
+ end_part = start_part + sz;
+
+ r = part_make_space(m, part, end_part, &p);
+ if (r < 0)
+ return NULL;
+
+ if (padding > 0) {
+ memset(p, 0, padding);
+ p = (uint8_t*) p + padding;
+ }
+
+ /* Readjust pointers */
+ for (c = m->containers; c < m->containers + m->n_containers; c++)
+ c->array_size = adjust_pointer(c->array_size, op, os, part->data);
+
+ m->error.message = (const char*) adjust_pointer(m->error.message, op, os, part->data);
}
- m->free_body = true;
+ m->header->body_size = end_body;
+ message_extend_containers(m, added);
return p;
}
ssize_t align, sz;
uint32_t k;
void *a;
- char *e = NULL;
int fd = -1;
uint32_t fdi = 0;
int r;
return -EPERM;
if (!bus_type_is_basic(type))
return -EINVAL;
+ if (m->poisoned)
+ return -ESTALE;
c = message_get_container(m);
if (c->signature[c->index] != type)
return -ENXIO;
} else {
+ char *e;
+
/* Maybe we can append to the signature? But only if this is the top-level container*/
if (c->enclosing != 0)
return -ENXIO;
e = strextend(&c->signature, CHAR_TO_STR(type), NULL);
- if (!e)
+ if (!e) {
+ m->poisoned = true;
return -ENOMEM;
+ }
}
switch (type) {
f = realloc(m->fds, sizeof(int) * (m->n_fds + 1));
if (!f) {
+ m->poisoned = true;
r = -ENOMEM;
goto fail;
}
return 0;
fail:
- /* Truncate extended signature again */
- if (e)
- c->signature[c->index] = 0;
-
if (fd >= 0)
close_nointr_nofail(fd);
return message_append_basic(m, type, p, NULL);
}
+int sd_bus_message_append_string_space(sd_bus_message *m, size_t size, char **s) {
+ struct bus_container *c;
+ void *a;
+
+ if (!m)
+ return -EINVAL;
+ if (!s)
+ return -EINVAL;
+ if (m->sealed)
+ return -EPERM;
+ if (m->poisoned)
+ return -ESTALE;
+
+ c = message_get_container(m);
+
+ if (c->signature && c->signature[c->index]) {
+ /* Container signature is already set */
+
+ if (c->signature[c->index] != SD_BUS_TYPE_STRING)
+ return -ENXIO;
+ } else {
+ char *e;
+
+ /* Maybe we can append to the signature? But only if this is the top-level container*/
+ if (c->enclosing != 0)
+ return -ENXIO;
+
+ e = strextend(&c->signature, CHAR_TO_STR(SD_BUS_TYPE_STRING), NULL);
+ if (!e) {
+ m->poisoned = true;
+ return -ENOMEM;
+ }
+ }
+
+ a = message_extend_body(m, 4, 4 + size + 1);
+ if (!a)
+ return -ENOMEM;
+
+ *(uint32_t*) a = size;
+ *s = (char*) a + 4;
+
+ (*s)[size] = 0;
+
+ if (c->enclosing != SD_BUS_TYPE_ARRAY)
+ c->index++;
+
+ return 0;
+}
+
static int bus_message_open_array(
sd_bus_message *m,
struct bus_container *c,
uint32_t **array_size) {
unsigned nindex;
- char *e = NULL;
- void *a, *b;
+ void *a, *op;
int alignment;
- size_t saved;
+ size_t os;
+ struct bus_body_part *o;
assert(m);
assert(c);
assert(contents);
assert(array_size);
- if (!signature_is_single(contents))
+ if (!signature_is_single(contents, true))
return -EINVAL;
alignment = bus_type_get_alignment(contents[0]);
nindex = c->index + 1 + strlen(contents);
} else {
+ char *e;
+
if (c->enclosing != 0)
return -ENXIO;
/* Extend the existing signature */
e = strextend(&c->signature, CHAR_TO_STR(SD_BUS_TYPE_ARRAY), contents, NULL);
- if (!e)
+ if (!e) {
+ m->poisoned = true;
return -ENOMEM;
+ }
nindex = e - c->signature;
}
- saved = m->header->body_size;
a = message_extend_body(m, 4, 4);
- if (!a) {
- /* Truncate extended signature again */
- if (e)
- c->signature[c->index] = 0;
-
+ if (!a)
return -ENOMEM;
- }
- b = m->body;
- if (!message_extend_body(m, alignment, 0)) {
- /* Add alignment between size and first element */
- if (e)
- c->signature[c->index] = 0;
+ o = m->body_end;
+ op = m->body_end->data;
+ os = m->body_end->size;
- m->header->body_size = saved;
+ /* Add alignment between size and first element */
+ if (!message_extend_body(m, alignment, 0))
return -ENOMEM;
- }
if (c->enclosing != SD_BUS_TYPE_ARRAY)
c->index = nindex;
- /* m->body might have changed so let's readjust a */
- a = (uint8_t*) m->body + ((uint8_t*) a - (uint8_t*) b);
- *(uint32_t*) a = 0;
+ /* location of array size might have changed so let's readjust a */
+ if (o == m->body_end)
+ a = adjust_pointer(a, op, os, m->body_end->data);
+ *(uint32_t*) a = 0;
*array_size = a;
return 0;
}
struct bus_container *c,
const char *contents) {
- char *e = NULL;
size_t l;
void *a;
assert(c);
assert(contents);
- if (!signature_is_single(contents))
+ if (!signature_is_single(contents, false))
return -EINVAL;
if (*contents == SD_BUS_TYPE_DICT_ENTRY_BEGIN)
return -ENXIO;
} else {
+ char *e;
+
if (c->enclosing != 0)
return -ENXIO;
e = strextend(&c->signature, CHAR_TO_STR(SD_BUS_TYPE_VARIANT), NULL);
- if (!e)
+ if (!e) {
+ m->poisoned = true;
return -ENOMEM;
+ }
}
l = strlen(contents);
a = message_extend_body(m, 1, 1 + l + 1);
- if (!a) {
- /* Truncate extended signature again */
- if (e)
- c->signature[c->index] = 0;
-
+ if (!a)
return -ENOMEM;
- }
*(uint8_t*) a = l;
memcpy((uint8_t*) a + 1, contents, l + 1);
const char *contents) {
size_t nindex;
- char *e = NULL;
assert(m);
assert(c);
nindex = c->index + 1 + l + 1;
} else {
+ char *e;
+
if (c->enclosing != 0)
return -ENXIO;
e = strextend(&c->signature, CHAR_TO_STR(SD_BUS_TYPE_STRUCT_BEGIN), contents, CHAR_TO_STR(SD_BUS_TYPE_STRUCT_END), NULL);
- if (!e)
+ if (!e) {
+ m->poisoned = true;
return -ENOMEM;
+ }
nindex = e - c->signature;
}
/* Align contents to 8 byte boundary */
- if (!message_extend_body(m, 8, 0)) {
- if (e)
- c->signature[c->index] = 0;
-
+ if (!message_extend_body(m, 8, 0))
return -ENOMEM;
- }
if (c->enclosing != SD_BUS_TYPE_ARRAY)
c->index = nindex;
struct bus_container *c, *w;
uint32_t *array_size = NULL;
char *signature;
+ size_t before;
int r;
if (!m)
return -EPERM;
if (!contents)
return -EINVAL;
+ if (m->poisoned)
+ return -ESTALE;
/* Make sure we have space for one more container */
w = realloc(m->containers, sizeof(struct bus_container) * (m->n_containers + 1));
- if (!w)
+ if (!w) {
+ m->poisoned = true;
return -ENOMEM;
+ }
+
m->containers = w;
c = message_get_container(m);
signature = strdup(contents);
- if (!signature)
+ if (!signature) {
+ m->poisoned = true;
return -ENOMEM;
+ }
+
+ /* Save old index in the parent container, in case we have to
+ * abort this container */
+ c->saved_index = c->index;
+ before = m->header->body_size;
if (type == SD_BUS_TYPE_ARRAY)
r = bus_message_open_array(m, c, contents, &array_size);
w->signature = signature;
w->index = 0;
w->array_size = array_size;
- w->begin = 0;
+ w->before = before;
+ w->begin = m->rindex;
return 0;
}
return -EPERM;
if (m->n_containers <= 0)
return -EINVAL;
+ if (m->poisoned)
+ return -ESTALE;
c = message_get_container(m);
if (c->enclosing != SD_BUS_TYPE_ARRAY)
return 0;
}
-
typedef struct {
const char *types;
unsigned n_struct;
n_struct -= k;
}
- r = type_stack_push(stack, ELEMENTSOF(stack), &stack_ptr, types, n_struct, n_array);
- if (r < 0)
- return r;
+ r = type_stack_push(stack, ELEMENTSOF(stack), &stack_ptr, types, n_struct, n_array);
+ if (r < 0)
+ return r;
+
+ types = t + 1;
+ n_struct = k;
+ n_array = va_arg(ap, unsigned);
+
+ break;
+ }
+
+ case SD_BUS_TYPE_VARIANT: {
+ const char *s;
+
+ s = va_arg(ap, const char*);
+ if (!s)
+ return -EINVAL;
+
+ r = sd_bus_message_open_container(m, SD_BUS_TYPE_VARIANT, s);
+ if (r < 0)
+ return r;
+
+ r = type_stack_push(stack, ELEMENTSOF(stack), &stack_ptr, types, n_struct, n_array);
+ if (r < 0)
+ return r;
+
+ types = s;
+ n_struct = strlen(s);
+ n_array = (unsigned) -1;
+
+ break;
+ }
+
+ case SD_BUS_TYPE_STRUCT_BEGIN:
+ case SD_BUS_TYPE_DICT_ENTRY_BEGIN: {
+ size_t k;
+
+ r = signature_element_length(t, &k);
+ if (r < 0)
+ return r;
+
+ {
+ char s[k - 1];
+
+ memcpy(s, t + 1, k - 2);
+ s[k - 2] = 0;
+
+ r = sd_bus_message_open_container(m, *t == SD_BUS_TYPE_STRUCT_BEGIN ? SD_BUS_TYPE_STRUCT : SD_BUS_TYPE_DICT_ENTRY, s);
+ if (r < 0)
+ return r;
+ }
+
+ if (n_array == (unsigned) -1) {
+ types += k - 1;
+ n_struct -= k - 1;
+ }
+
+ r = type_stack_push(stack, ELEMENTSOF(stack), &stack_ptr, types, n_struct, n_array);
+ if (r < 0)
+ return r;
+
+ types = t + 1;
+ n_struct = k - 2;
+ n_array = (unsigned) -1;
+
+ break;
+ }
+
+ default:
+ r = -EINVAL;
+ }
+
+ if (r < 0)
+ return r;
+ }
+
+ return 0;
+}
+
+int sd_bus_message_append(sd_bus_message *m, const char *types, ...) {
+ va_list ap;
+ int r;
+
+ if (!m)
+ return -EINVAL;
+ if (m->sealed)
+ return -EPERM;
+ if (m->poisoned)
+ return -ESTALE;
+ if (!types)
+ return 0;
+
+ va_start(ap, types);
+ r = bus_message_append_ap(m, types, ap);
+ va_end(ap);
+
+ return r;
+}
+
+int sd_bus_message_append_array_space(sd_bus_message *m, char type, size_t size, void **ptr) {
+ ssize_t align, sz;
+ void *a;
+ int r;
+
+ if (!m)
+ return -EINVAL;
+ if (m->sealed)
+ return -EPERM;
+ if (!bus_type_is_trivial(type))
+ return -EINVAL;
+ if (!ptr && size > 0)
+ return -EINVAL;
+ if (m->poisoned)
+ return -ESTALE;
+
+ align = bus_type_get_alignment(type);
+ sz = bus_type_get_size(type);
+
+ assert_se(align > 0);
+ assert_se(sz > 0);
+
+ if (size % sz != 0)
+ return -EINVAL;
+
+ r = sd_bus_message_open_container(m, SD_BUS_TYPE_ARRAY, CHAR_TO_STR(type));
+ if (r < 0)
+ return r;
+
+ a = message_extend_body(m, align, size);
+ if (!a)
+ return -ENOMEM;
+
+ r = sd_bus_message_close_container(m);
+ if (r < 0)
+ return r;
+
+ *ptr = a;
+ return 0;
+}
+
+int sd_bus_message_append_array(sd_bus_message *m, char type, const void *ptr, size_t size) {
+ int r;
+ void *p;
+
+ if (!ptr && size > 0)
+ return -EINVAL;
+
+ r = sd_bus_message_append_array_space(m, type, size, &p);
+ if (r < 0)
+ return r;
+
+ if (size > 0)
+ memcpy(p, ptr, size);
+
+ return 0;
+}
+
+int sd_bus_message_append_array_memfd(sd_bus_message *m, char type, sd_memfd *memfd) {
+ _cleanup_close_ int copy_fd = -1;
+ struct bus_body_part *part;
+ ssize_t align, sz;
+ uint64_t size;
+ void *a;
+ int r;
+
+ if (!m)
+ return -EINVAL;
+ if (!memfd)
+ return -EINVAL;
+ if (m->sealed)
+ return -EPERM;
+ if (!bus_type_is_trivial(type))
+ return -EINVAL;
+ if (m->poisoned)
+ return -ESTALE;
+
+ r = sd_memfd_set_sealed(memfd, true);
+ if (r < 0)
+ return r;
+
+ copy_fd = sd_memfd_dup_fd(memfd);
+ if (copy_fd < 0)
+ return copy_fd;
+
+ r = sd_memfd_get_size(memfd, &size);
+ if (r < 0)
+ return r;
+
+ align = bus_type_get_alignment(type);
+ sz = bus_type_get_size(type);
+
+ assert_se(align > 0);
+ assert_se(sz > 0);
+
+ if (size % sz != 0)
+ return -EINVAL;
+
+ if (size > (uint64_t) (uint32_t) -1)
+ return -EINVAL;
+
+ r = sd_bus_message_open_container(m, SD_BUS_TYPE_ARRAY, CHAR_TO_STR(type));
+ if (r < 0)
+ return r;
+
+ a = message_extend_body(m, align, 0);
+ if (!a)
+ return -ENOMEM;
+
+ part = message_append_part(m);
+ if (!part)
+ return -ENOMEM;
+
+ part->memfd = copy_fd;
+ part->sealed = true;
+ part->size = size;
+ copy_fd = -1;
+
+ message_extend_containers(m, size);
+ m->header->body_size += size;
+
+ return sd_bus_message_close_container(m);
+}
+
+int sd_bus_message_append_string_memfd(sd_bus_message *m, sd_memfd *memfd) {
+ _cleanup_close_ int copy_fd = -1;
+ struct bus_body_part *part;
+ struct bus_container *c;
+ uint64_t size;
+ void *a;
+ int r;
+
+ if (!m)
+ return -EINVAL;
+ if (!memfd)
+ return -EINVAL;
+ if (m->sealed)
+ return -EPERM;
+ if (m->poisoned)
+ return -ESTALE;
+
+ r = sd_memfd_set_sealed(memfd, true);
+ if (r < 0)
+ return r;
+
+ copy_fd = sd_memfd_dup_fd(memfd);
+ if (copy_fd < 0)
+ return copy_fd;
+
+ r = sd_memfd_get_size(memfd, &size);
+ if (r < 0)
+ return r;
+
+ /* We require this to be NUL terminated */
+ if (size == 0)
+ return -EINVAL;
+
+ if (size > (uint64_t) (uint32_t) -1)
+ return -EINVAL;
+
+ c = message_get_container(m);
+ if (c->signature && c->signature[c->index]) {
+ /* Container signature is already set */
+
+ if (c->signature[c->index] != SD_BUS_TYPE_STRING)
+ return -ENXIO;
+ } else {
+ char *e;
- types = t + 1;
- n_struct = k;
- n_array = va_arg(ap, unsigned);
+ /* Maybe we can append to the signature? But only if this is the top-level container*/
+ if (c->enclosing != 0)
+ return -ENXIO;
- break;
+ e = strextend(&c->signature, CHAR_TO_STR(SD_BUS_TYPE_STRING), NULL);
+ if (!e) {
+ m->poisoned = true;
+ return -ENOMEM;
}
+ }
- case SD_BUS_TYPE_VARIANT: {
- const char *s;
-
- s = va_arg(ap, const char*);
- if (!s)
- return -EINVAL;
+ a = message_extend_body(m, 4, 4);
+ if (!a)
+ return -ENOMEM;
- r = sd_bus_message_open_container(m, SD_BUS_TYPE_VARIANT, s);
- if (r < 0)
- return r;
+ *(uint32_t*) a = size - 1;
- r = type_stack_push(stack, ELEMENTSOF(stack), &stack_ptr, types, n_struct, n_array);
- if (r < 0)
- return r;
+ part = message_append_part(m);
+ if (!part)
+ return -ENOMEM;
- types = s;
- n_struct = strlen(s);
- n_array = (unsigned) -1;
+ part->memfd = copy_fd;
+ part->sealed = true;
+ part->size = size;
+ copy_fd = -1;
- break;
- }
+ message_extend_containers(m, size);
+ m->header->body_size += size;
- case SD_BUS_TYPE_STRUCT_BEGIN:
- case SD_BUS_TYPE_DICT_ENTRY_BEGIN: {
- size_t k;
+ if (c->enclosing != SD_BUS_TYPE_ARRAY)
+ c->index++;
- r = signature_element_length(t, &k);
- if (r < 0)
- return r;
+ return 0;
+}
- {
- char s[k - 1];
+int bus_body_part_map(struct bus_body_part *part) {
+ void *p;
+ size_t psz;
- memcpy(s, t + 1, k - 2);
- s[k - 2] = 0;
+ assert_se(part);
- r = sd_bus_message_open_container(m, *t == SD_BUS_TYPE_STRUCT_BEGIN ? SD_BUS_TYPE_STRUCT : SD_BUS_TYPE_DICT_ENTRY, s);
- if (r < 0)
- return r;
- }
+ if (part->data)
+ return 0;
- if (n_array == (unsigned) -1) {
- types += k - 1;
- n_struct -= k - 1;
- }
+ if (part->size <= 0)
+ return 0;
- r = type_stack_push(stack, ELEMENTSOF(stack), &stack_ptr, types, n_struct, n_array);
- if (r < 0)
- return r;
+ /* For smaller zero parts (as used for padding) we don't need to map anything... */
+ if (part->memfd < 0 && part->is_zero && part->size < 8) {
+ static const uint8_t zeroes[7] = { };
+ part->data = (void*) zeroes;
+ return 0;
+ }
- types = t + 1;
- n_struct = k - 2;
- n_array = (unsigned) -1;
+ psz = PAGE_ALIGN(part->size);
- break;
- }
+ if (part->memfd >= 0)
+ p = mmap(NULL, psz, PROT_READ, MAP_SHARED, part->memfd, 0);
+ else if (part->is_zero)
+ p = mmap(NULL, psz, PROT_READ, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
+ else
+ return -EINVAL;
- default:
- r = -EINVAL;
- }
+ if (p == MAP_FAILED)
+ return -errno;
- if (r < 0)
- return r;
- }
+ part->mapped = psz;
+ part->data = p;
+ part->munmap_this = true;
return 0;
}
-int sd_bus_message_append(sd_bus_message *m, const char *types, ...) {
- va_list ap;
- int r;
+void bus_body_part_unmap(struct bus_body_part *part) {
- if (!m)
- return -EINVAL;
- if (m->sealed)
- return -EPERM;
- if (!types)
- return 0;
+ assert_se(part);
- va_start(ap, types);
- r = bus_message_append_ap(m, types, ap);
- va_end(ap);
+ if (part->memfd < 0)
+ return;
- return r;
+ if (!part->data)
+ return;
+
+ if (!part->munmap_this)
+ return;
+
+ assert_se(munmap(part->data, part->mapped) == 0);
+
+ part->data = NULL;
+ part->mapped = 0;
+ part->munmap_this = false;
+
+ return;
}
static int buffer_peek(const void *p, uint32_t sz, size_t *rindex, size_t align, size_t nbytes, void **r) {
- size_t k, start, n;
+ size_t k, start, end;
assert(rindex);
assert(align > 0);
start = ALIGN_TO((size_t) *rindex, align);
- n = start + nbytes;
+ end = start + nbytes;
- if (n > sz)
+ if (end > sz)
return -EBADMSG;
/* Verify that padding is 0 */
if (r)
*r = (uint8_t*) p + start;
- *rindex = n;
+ *rindex = end;
return 1;
}
return index >= c->begin + BUS_MESSAGE_BSWAP32(m, *c->array_size);
}
-static int message_peek_body(sd_bus_message *m, size_t *rindex, size_t align, size_t nbytes, void **ret) {
+static struct bus_body_part* find_part(sd_bus_message *m, size_t index, size_t sz, void **p) {
+ struct bus_body_part *part;
+ size_t begin;
+ int r;
+
+ assert(m);
+
+ if (m->cached_rindex_part && index >= m->cached_rindex_part_begin) {
+ part = m->cached_rindex_part;
+ begin = m->cached_rindex_part_begin;
+ } else {
+ part = &m->body;
+ begin = 0;
+ }
+
+ while (part) {
+ if (index < begin)
+ return NULL;
+
+ if (index + sz <= begin + part->size) {
+
+ r = bus_body_part_map(part);
+ if (r < 0)
+ return NULL;
+
+ if (p)
+ *p = (uint8_t*) part->data + index - begin;
+
+ m->cached_rindex_part = part;
+ m->cached_rindex_part_begin = begin;
+
+ return part;
+ }
+
+ begin += part->size;
+ part = part->next;
+ }
+
+ return NULL;
+}
+
+static int message_peek_body(
+ sd_bus_message *m,
+ size_t *rindex,
+ size_t align,
+ size_t nbytes,
+ void **ret) {
+
+ size_t k, start, end, padding;
+ struct bus_body_part *part;
+ uint8_t *q;
+
assert(m);
assert(rindex);
assert(align > 0);
if (message_end_of_array(m, *rindex))
return 0;
- return buffer_peek(m->body, BUS_MESSAGE_BODY_SIZE(m), rindex, align, nbytes, ret);
+ start = ALIGN_TO((size_t) *rindex, align);
+ padding = start - *rindex;
+ end = start + nbytes;
+
+ if (end > BUS_MESSAGE_BODY_SIZE(m))
+ return -EBADMSG;
+
+ part = find_part(m, *rindex, padding, (void**) &q);
+ if (!part)
+ return -EBADMSG;
+
+ if (q) {
+ /* Verify padding */
+ for (k = 0; k < padding; k++)
+ if (q[k] != 0)
+ return -EBADMSG;
+ }
+
+ part = find_part(m, start, nbytes, (void**) &q);
+ if (!part || !q)
+ return -EBADMSG;
+
+ *rindex = end;
+
+ if (ret)
+ *ret = q;
+
+ return 1;
}
static bool validate_nul(const char *s, size_t l) {
assert_not_reached("Unknown basic type...");
}
- m->rindex = rindex;
+ m->rindex = rindex;
break;
}
assert(contents);
assert(array_size);
- if (!signature_is_single(contents))
+ if (!signature_is_single(contents, true))
return -EINVAL;
alignment = bus_type_get_alignment(contents[0]);
assert(c);
assert(contents);
- if (!signature_is_single(contents))
+ if (!signature_is_single(contents, false))
return -EINVAL;
if (*contents == SD_BUS_TYPE_DICT_ENTRY_BEGIN)
struct bus_container *c, *w;
uint32_t *array_size = NULL;
char *signature;
+ size_t before;
int r;
if (!m)
if (!signature)
return -ENOMEM;
+ c->saved_index = c->index;
+ before = m->rindex;
+
if (type == SD_BUS_TYPE_ARRAY)
r = bus_message_enter_array(m, c, contents, &array_size);
else if (type == SD_BUS_TYPE_VARIANT)
w->signature = signature;
w->index = 0;
w->array_size = array_size;
+ w->before = before;
w->begin = m->rindex;
return 1;
return 1;
}
+static void message_quit_container(sd_bus_message *m) {
+ struct bus_container *c;
+
+ assert(m);
+ assert(m->sealed);
+ assert(m->n_containers > 0);
+
+ c = message_get_container(m);
+
+ /* Undo seeks */
+ assert(m->rindex >= c->before);
+ m->rindex = c->before;
+
+ /* Free container */
+ free(c->signature);
+ m->n_containers--;
+
+ /* Correct index of new top-level container */
+ c = message_get_container(m);
+ c->index = c->saved_index;
+}
+
int sd_bus_message_peek_type(sd_bus_message *m, char *type, const char **contents) {
struct bus_container *c;
int r;
return -EPERM;
if (complete) {
- reset_containers(m);
+ message_reset_containers(m);
m->rindex = 0;
m->root_container.index = 0;
return r;
}
+int sd_bus_message_read_array(sd_bus_message *m, char type, const void **ptr, size_t *size) {
+ struct bus_container *c;
+ void *p;
+ size_t sz;
+ ssize_t align;
+ int r;
+
+ if (!m)
+ return -EINVAL;
+ if (!m->sealed)
+ return -EPERM;
+ if (!bus_type_is_trivial(type))
+ return -EINVAL;
+ if (!ptr)
+ return -EINVAL;
+ if (!size)
+ return -EINVAL;
+ if (BUS_MESSAGE_NEED_BSWAP(m))
+ return -ENOTSUP;
+
+ align = bus_type_get_alignment(type);
+ if (align < 0)
+ return align;
+
+ r = sd_bus_message_enter_container(m, SD_BUS_TYPE_ARRAY, CHAR_TO_STR(type));
+ if (r <= 0)
+ return r;
+
+ c = message_get_container(m);
+ sz = BUS_MESSAGE_BSWAP32(m, *c->array_size);
+
+ r = message_peek_body(m, &m->rindex, align, sz, &p);
+ if (r < 0)
+ goto fail;
+ if (r == 0) {
+ r = -EBADMSG;
+ goto fail;
+ }
+
+ r = sd_bus_message_exit_container(m);
+ if (r < 0)
+ goto fail;
+
+ *ptr = (const void*) p;
+ *size = sz;
+
+ return 1;
+
+fail:
+ message_quit_container(m);
+ return r;
+}
+
static int message_peek_fields(
sd_bus_message *m,
size_t *rindex,
assert(rindex);
assert(align > 0);
- return buffer_peek(m->fields, BUS_MESSAGE_FIELDS_SIZE(m), rindex, align, nbytes, ret);
+ return buffer_peek(BUS_MESSAGE_FIELDS(m), BUS_MESSAGE_FIELDS_SIZE(m), rindex, align, nbytes, ret);
}
static int message_peek_field_uint32(
}
}
-static int message_parse_fields(sd_bus_message *m) {
+int bus_message_parse_fields(sd_bus_message *m) {
size_t ri;
int r;
uint32_t unix_fds = 0;
return 0;
}
-static void setup_iovec(sd_bus_message *m) {
- assert(m);
- assert(m->sealed);
-
- m->n_iovec = 0;
- m->size = 0;
-
- m->iovec[m->n_iovec].iov_base = m->header;
- m->iovec[m->n_iovec].iov_len = sizeof(*m->header);
- m->size += m->iovec[m->n_iovec].iov_len;
- m->n_iovec++;
-
- if (m->fields) {
- m->iovec[m->n_iovec].iov_base = m->fields;
- m->iovec[m->n_iovec].iov_len = m->header->fields_size;
- m->size += m->iovec[m->n_iovec].iov_len;
- m->n_iovec++;
-
- if (m->header->fields_size % 8 != 0) {
- static const uint8_t padding[7] = { 0, 0, 0, 0, 0, 0, 0 };
-
- m->iovec[m->n_iovec].iov_base = (void*) padding;
- m->iovec[m->n_iovec].iov_len = 8 - m->header->fields_size % 8;
- m->size += m->iovec[m->n_iovec].iov_len;
- m->n_iovec++;
- }
- }
-
- if (m->body) {
- m->iovec[m->n_iovec].iov_base = m->body;
- m->iovec[m->n_iovec].iov_len = m->header->body_size;
- m->size += m->iovec[m->n_iovec].iov_len;
- m->n_iovec++;
- }
-}
-
int bus_message_seal(sd_bus_message *m, uint64_t serial) {
+ struct bus_body_part *part;
+ size_t l, a;
+ unsigned i;
int r;
assert(m);
if (m->n_containers > 0)
return -EBADMSG;
+ if (m->poisoned)
+ return -ESTALE;
+
/* If there's a non-trivial signature set, then add it in here */
if (!isempty(m->root_container.signature)) {
r = message_append_field_signature(m, SD_BUS_MESSAGE_HEADER_SIGNATURE, m->root_container.signature, NULL);
return r;
}
+ /* Add padding at the end of the fields part, since we know
+ * the body needs to start at an 8 byte alignment. We made
+ * sure we allocated enough space for this, so all we need to
+ * do here is to zero it out. */
+ l = BUS_MESSAGE_FIELDS_SIZE(m);
+ a = ALIGN8(l) - l;
+ if (a > 0)
+ memset((uint8_t*) BUS_MESSAGE_FIELDS(m) + l, 0, a);
+
+ /* If this is something we can send as memfd, then let's seal
+ the memfd now. Note that we can send memfds as payload only
+ for directed messages, and not for broadcasts. */
+ if (m->destination && m->bus && m->bus->use_memfd) {
+ MESSAGE_FOREACH_PART(part, i, m)
+ if (part->memfd >= 0 && !part->sealed && (part->size > MEMFD_MIN_SIZE || m->bus->use_memfd < 0)) {
+ bus_body_part_unmap(part);
+
+ if (ioctl(part->memfd, KDBUS_CMD_MEMFD_SEAL_SET, 1) >= 0)
+ part->sealed = true;
+ }
+ }
+
m->header->serial = serial;
m->sealed = true;
- setup_iovec(m);
-
return 0;
}
}
int bus_message_dump(sd_bus_message *m) {
+ const char *u = NULL, *uu = NULL, *s = NULL;
+ char **cmdline = NULL;
unsigned level = 1;
int r;
+ uid_t owner, audit_loginuid;
+ uint32_t audit_sessionid;
assert(m);
"\treply_serial=%u\n"
"\terror.name=%s\n"
"\terror.message=%s\n"
- "\tsealed=%s\n",
+ "\tsealed=%s\n"
+ "\tn_body_parts=%u\n",
m,
m->n_ref,
m->header->endian,
m->reply_serial,
strna(m->error.name),
strna(m->error.message),
- yes_no(m->sealed));
+ yes_no(m->sealed),
+ m->n_body_parts);
+
+ if (m->pid != 0)
+ printf("\tpid=%lu\n", (unsigned long) m->pid);
+ if (m->tid != 0)
+ printf("\ttid=%lu\n", (unsigned long) m->tid);
+ if (m->uid_valid)
+ printf("\tuid=%lu\n", (unsigned long) m->uid);
+ if (m->gid_valid)
+ printf("\tgid=%lu\n", (unsigned long) m->gid);
+ if (m->pid_starttime != 0)
+ printf("\tpid_starttime=%llu\n", (unsigned long long) m->pid_starttime);
+ if (m->monotonic != 0)
+ printf("\tmonotonic=%llu\n", (unsigned long long) m->monotonic);
+ if (m->realtime != 0)
+ printf("\trealtime=%llu\n", (unsigned long long) m->realtime);
+ if (m->exe)
+ printf("\texe=[%s]\n", m->exe);
+ if (m->comm)
+ printf("\tcomm=[%s]\n", m->comm);
+ if (m->tid_comm)
+ printf("\ttid_comm=[%s]\n", m->tid_comm);
+ if (m->label)
+ printf("\tlabel=[%s]\n", m->label);
+ if (m->cgroup)
+ printf("\tcgroup=[%s]\n", m->cgroup);
+
+ sd_bus_message_get_unit(m, &u);
+ if (u)
+ printf("\tunit=[%s]\n", u);
+ sd_bus_message_get_user_unit(m, &uu);
+ if (uu)
+ printf("\tuser_unit=[%s]\n", uu);
+ sd_bus_message_get_session(m, &s);
+ if (s)
+ printf("\tsession=[%s]\n", s);
+ if (sd_bus_message_get_owner_uid(m, &owner) >= 0)
+ printf("\towner_uid=%lu\n", (unsigned long) owner);
+ if (sd_bus_message_get_audit_loginuid(m, &audit_loginuid) >= 0)
+ printf("\taudit_loginuid=%lu\n", (unsigned long) audit_loginuid);
+ if (sd_bus_message_get_audit_sessionid(m, &audit_sessionid) >= 0)
+ printf("\taudit_sessionid=%lu\n", (unsigned long) audit_sessionid);
+
+ printf("\tCAP_KILL=%i\n", sd_bus_message_has_effective_cap(m, 5));
+
+ if (sd_bus_message_get_cmdline(m, &cmdline) >= 0) {
+ char **c;
+
+ fputs("\tcmdline=[", stdout);
+ STRV_FOREACH(c, cmdline) {
+ if (c != cmdline)
+ putchar(' ');
+
+ fputs(*c, stdout);
+ }
+
+ fputs("]\n", stdout);
+ }
r = sd_bus_message_rewind(m, true);
if (r < 0) {
int bus_message_get_blob(sd_bus_message *m, void **buffer, size_t *sz) {
size_t total;
- unsigned i;
void *p, *e;
+ unsigned i;
+ struct bus_body_part *part;
assert(m);
assert(buffer);
assert(sz);
- for (i = 0, total = 0; i < m->n_iovec; i++)
- total += m->iovec[i].iov_len;
+ total = BUS_MESSAGE_SIZE(m);
p = malloc(total);
if (!p)
return -ENOMEM;
- for (i = 0, e = p; i < m->n_iovec; i++)
- e = mempcpy(e, m->iovec[i].iov_base, m->iovec[i].iov_len);
+ e = mempcpy(p, m->header, BUS_MESSAGE_BODY_BEGIN(m));
+ MESSAGE_FOREACH_PART(part, i, m)
+ e = mempcpy(e, part->data, part->size);
+
+ assert(total == (size_t) ((uint8_t*) e - (uint8_t*) p));
*buffer = p;
*sz = total;
const char* bus_message_get_arg(sd_bus_message *m, unsigned i) {
int r;
- const char *t;
- char type;
+ const char *t = NULL;
+ unsigned j;
assert(m);
if (r < 0)
return NULL;
- while (i > 0) {
+ for (j = 0; j <= i; j++) {
+ char type;
+
r = sd_bus_message_peek_type(m, &type, NULL);
if (r < 0)
return NULL;
r = sd_bus_message_read_basic(m, type, &t);
if (r < 0)
return NULL;
-
- i--;
}
- r = sd_bus_message_rewind(m, true);
- if (r < 0)
- return NULL;
-
return t;
}
+
+bool bus_header_is_complete(struct bus_header *h, size_t size) {
+ size_t full;
+
+ assert(h);
+ assert(size);
+
+ if (size < sizeof(struct bus_header))
+ return false;
+
+ full = sizeof(struct bus_header) +
+ (h->endian == SD_BUS_NATIVE_ENDIAN ? h->fields_size : bswap_32(h->fields_size));
+
+ return size >= full;
+}
+
+int bus_header_message_size(struct bus_header *h, size_t *sum) {
+ size_t fs, bs;
+
+ assert(h);
+ assert(sum);
+
+ if (h->endian == SD_BUS_NATIVE_ENDIAN) {
+ fs = h->fields_size;
+ bs = h->body_size;
+ } else if (h->endian == SD_BUS_REVERSE_ENDIAN) {
+ fs = bswap_32(h->fields_size);
+ bs = bswap_32(h->body_size);
+ } else
+ return -EBADMSG;
+
+ *sum = sizeof(struct bus_header) + ALIGN8(fs) + bs;
+ return 0;
+}
+
+int bus_message_to_errno(sd_bus_message *m) {
+ assert(m);
+
+ if (m->header->type != SD_BUS_MESSAGE_TYPE_METHOD_ERROR)
+ return 0;
+
+ return bus_error_to_errno(&m->error);
+}
+
+int sd_bus_message_get_signature(sd_bus_message *m, int complete, const char **signature) {
+ struct bus_container *c;
+
+ if (!m)
+ return -EINVAL;
+ if (!signature)
+ return -EINVAL;
+
+ c = complete ? &m->root_container : message_get_container(m);
+ *signature = c->signature ?: "";
+ return 0;
+}
~ianmdlvl / elogind.git / blobdiff