X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-bus%2Fsd-bus.c;h=ee5f3955695fb618ba50ef964eabf8d72ccb747a;hb=8ce2afd6347dcf01e33fe1ff257e2b0fffa8edfe;hp=08a218b7cccbf7174f16f5b2da789fa1a194ffc3;hpb=8333c77edf8fd1654cd96f3f6ee0f078dd64b58b;p=elogind.git diff --git a/src/libsystemd-bus/sd-bus.c b/src/libsystemd-bus/sd-bus.c index 08a218b7c..ee5f39556 100644 --- a/src/libsystemd-bus/sd-bus.c +++ b/src/libsystemd-bus/sd-bus.c @@ -26,34 +26,94 @@ #include #include #include +#include +#include #include "util.h" #include "macro.h" #include "strv.h" #include "set.h" +#include "missing.h" #include "sd-bus.h" #include "bus-internal.h" #include "bus-message.h" #include "bus-type.h" #include "bus-socket.h" +#include "bus-kernel.h" +#include "bus-control.h" +#include "bus-introspect.h" +#include "bus-signature.h" +#include "bus-objects.h" static int bus_poll(sd_bus *bus, bool need_more, uint64_t timeout_usec); +static void bus_close_fds(sd_bus *b) { + assert(b); + + if (b->input_fd >= 0) + close_nointr_nofail(b->input_fd); + + if (b->output_fd >= 0 && b->output_fd != b->input_fd) + close_nointr_nofail(b->output_fd); + + b->input_fd = b->output_fd = -1; +} + +static void bus_node_destroy(sd_bus *b, struct node *n) { + struct node_callback *c; + struct node_vtable *v; + struct node_enumerator *e; + + assert(b); + + if (!n) + return; + + while (n->child) + bus_node_destroy(b, n->child); + + while ((c = n->callbacks)) { + LIST_REMOVE(callbacks, n->callbacks, c); + free(c); + } + + while ((v = n->vtables)) { + LIST_REMOVE(vtables, n->vtables, v); + free(v->interface); + free(v); + } + + while ((e = n->enumerators)) { + LIST_REMOVE(enumerators, n->enumerators, e); + free(e); + } + + if (n->parent) + LIST_REMOVE(siblings, n->parent->child, n); + + assert_se(hashmap_remove(b->nodes, n->path) == n); + free(n->path); + free(n); +} + static void bus_free(sd_bus *b) { struct filter_callback *f; - struct object_callback *c; + struct node *n; unsigned i; assert(b); - if (b->fd >= 0) - close_nointr_nofail(b->fd); + bus_close_fds(b); + + if (b->kdbus_buffer) + munmap(b->kdbus_buffer, KDBUS_POOL_SIZE); free(b->rbuffer); free(b->unique_name); - free(b->auth_uid); + free(b->auth_buffer); free(b->address); + free(b->kernel); free(b->exec_path); strv_free(b->exec_argv); @@ -73,16 +133,23 @@ static void bus_free(sd_bus *b) { prioq_free(b->reply_callbacks_prioq); while ((f = b->filter_callbacks)) { - LIST_REMOVE(struct filter_callback, callbacks, b->filter_callbacks, f); + LIST_REMOVE(callbacks, b->filter_callbacks, f); free(f); } - while ((c = hashmap_steal_first(b->object_callbacks))) { - free(c->path); - free(c); - } + bus_match_free(&b->match_callbacks); + + hashmap_free_free(b->vtable_methods); + hashmap_free_free(b->vtable_properties); + + while ((n = hashmap_first(b->nodes))) + bus_node_destroy(b, n); + + hashmap_free(b->nodes); + + bus_kernel_flush_memfd(b); - hashmap_free(b->object_callbacks); + assert_se(pthread_mutex_destroy(&b->memfd_cache_mutex) == 0); free(b); } @@ -90,17 +157,19 @@ static void bus_free(sd_bus *b) { int sd_bus_new(sd_bus **ret) { sd_bus *r; - if (!ret) - return -EINVAL; + assert_return(ret, -EINVAL); r = new0(sd_bus, 1); if (!r) return -ENOMEM; - r->n_ref = 1; - r->fd = -1; + r->n_ref = REFCNT_INIT; + r->input_fd = r->output_fd = -1; r->message_version = 1; - r->negotiate_fds = true; + r->hello_flags |= KDBUS_HELLO_ACCEPT_FD; + r->original_pid = getpid(); + + assert_se(pthread_mutex_init(&r->memfd_cache_mutex, NULL) == 0); /* We guarantee that wqueue always has space for at least one * entry */ @@ -117,12 +186,10 @@ int sd_bus_new(sd_bus **ret) { int sd_bus_set_address(sd_bus *bus, const char *address) { char *a; - if (!bus) - return -EINVAL; - if (bus->state != BUS_UNSET) - return -EPERM; - if (!address) - return -EINVAL; + assert_return(bus, -EINVAL); + assert_return(bus->state == BUS_UNSET, -EPERM); + assert_return(address, -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); a = strdup(address); if (!a) @@ -134,29 +201,26 @@ int sd_bus_set_address(sd_bus *bus, const char *address) { return 0; } -int sd_bus_set_fd(sd_bus *bus, int fd) { - if (!bus) - return -EINVAL; - if (bus->state != BUS_UNSET) - return -EPERM; - if (fd < 0) - return -EINVAL; +int sd_bus_set_fd(sd_bus *bus, int input_fd, int output_fd) { + assert_return(bus, -EINVAL); + assert_return(bus->state == BUS_UNSET, -EPERM); + assert_return(input_fd >= 0, -EINVAL); + assert_return(output_fd >= 0, -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); - bus->fd = fd; + bus->input_fd = input_fd; + bus->output_fd = output_fd; return 0; } int sd_bus_set_exec(sd_bus *bus, const char *path, char *const argv[]) { char *p, **a; - if (!bus) - return -EINVAL; - if (bus->state != BUS_UNSET) - return -EPERM; - if (!path) - return -EINVAL; - if (strv_isempty(argv)) - return -EINVAL; + assert_return(bus, -EINVAL); + assert_return(bus->state == BUS_UNSET, -EPERM); + assert_return(path, -EINVAL); + assert_return(!strv_isempty(argv), -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); p = strdup(path); if (!p) @@ -178,37 +242,118 @@ int sd_bus_set_exec(sd_bus *bus, const char *path, char *const argv[]) { } int sd_bus_set_bus_client(sd_bus *bus, int b) { - if (!bus) - return -EINVAL; - if (bus->state != BUS_UNSET) - return -EPERM; + assert_return(bus, -EINVAL); + assert_return(bus->state == BUS_UNSET, -EPERM); + assert_return(!bus_pid_changed(bus), -ECHILD); bus->bus_client = !!b; return 0; } -int sd_bus_set_negotiate_fds(sd_bus *bus, int b) { - if (!bus) - return -EINVAL; - if (bus->state != BUS_UNSET) - return -EPERM; +int sd_bus_negotiate_fds(sd_bus *bus, int b) { + assert_return(bus, -EINVAL); + assert_return(bus->state == BUS_UNSET, -EPERM); + assert_return(!bus_pid_changed(bus), -ECHILD); + + SET_FLAG(bus->hello_flags, KDBUS_HELLO_ACCEPT_FD, b); + return 0; +} + +int sd_bus_negotiate_attach_comm(sd_bus *bus, int b) { + assert_return(bus, -EINVAL); + assert_return(bus->state == BUS_UNSET, -EPERM); + assert_return(!bus_pid_changed(bus), -ECHILD); + + SET_FLAG(bus->hello_flags, KDBUS_HELLO_ATTACH_COMM, b); + return 0; +} + +int sd_bus_negotiate_attach_exe(sd_bus *bus, int b) { + assert_return(bus, -EINVAL); + assert_return(bus->state == BUS_UNSET, -EPERM); + assert_return(!bus_pid_changed(bus), -ECHILD); + + SET_FLAG(bus->hello_flags, KDBUS_HELLO_ATTACH_EXE, b); + return 0; +} + +int sd_bus_negotiate_attach_cmdline(sd_bus *bus, int b) { + assert_return(bus, -EINVAL); + assert_return(bus->state == BUS_UNSET, -EPERM); + assert_return(!bus_pid_changed(bus), -ECHILD); - bus->negotiate_fds = !!b; + SET_FLAG(bus->hello_flags, KDBUS_HELLO_ATTACH_CMDLINE, b); return 0; } -static int hello_callback(sd_bus *bus, int error, sd_bus_message *reply, void *userdata) { +int sd_bus_negotiate_attach_cgroup(sd_bus *bus, int b) { + assert_return(bus, -EINVAL); + assert_return(bus->state == BUS_UNSET, -EPERM); + assert_return(!bus_pid_changed(bus), -ECHILD); + + SET_FLAG(bus->hello_flags, KDBUS_HELLO_ATTACH_CGROUP, b); + return 0; +} + +int sd_bus_negotiate_attach_caps(sd_bus *bus, int b) { + assert_return(bus, -EINVAL); + assert_return(bus->state == BUS_UNSET, -EPERM); + assert_return(!bus_pid_changed(bus), -ECHILD); + + SET_FLAG(bus->hello_flags, KDBUS_HELLO_ATTACH_CAPS, b); + return 0; +} + +int sd_bus_negotiate_attach_selinux_context(sd_bus *bus, int b) { + assert_return(bus, -EINVAL); + assert_return(bus->state == BUS_UNSET, -EPERM); + assert_return(!bus_pid_changed(bus), -ECHILD); + + SET_FLAG(bus->hello_flags, KDBUS_HELLO_ATTACH_SECLABEL, b); + return 0; +} + +int sd_bus_negotiate_attach_audit(sd_bus *bus, int b) { + assert_return(bus, -EINVAL); + assert_return(bus->state == BUS_UNSET, -EPERM); + assert_return(!bus_pid_changed(bus), -ECHILD); + + SET_FLAG(bus->hello_flags, KDBUS_HELLO_ATTACH_AUDIT, b); + return 0; +} + +int sd_bus_set_server(sd_bus *bus, int b, sd_id128_t server_id) { + assert_return(bus, -EINVAL); + assert_return(b || sd_id128_equal(server_id, SD_ID128_NULL), -EINVAL); + assert_return(bus->state == BUS_UNSET, -EPERM); + assert_return(!bus_pid_changed(bus), -ECHILD); + + bus->is_server = !!b; + bus->server_id = server_id; + return 0; +} + +int sd_bus_set_anonymous(sd_bus *bus, int b) { + assert_return(bus, -EINVAL); + assert_return(bus->state == BUS_UNSET, -EPERM); + assert_return(!bus_pid_changed(bus), -ECHILD); + + bus->anonymous_auth = !!b; + return 0; +} + +static int hello_callback(sd_bus *bus, sd_bus_message *reply, void *userdata) { const char *s; int r; assert(bus); assert(bus->state == BUS_HELLO); - - if (error != 0) - return -error; - assert(reply); + r = bus_message_to_errno(reply); + if (r < 0) + return r; + r = sd_bus_message_read(reply, "s", &s); if (r < 0) return r; @@ -231,7 +376,7 @@ static int bus_send_hello(sd_bus *bus) { assert(bus); - if (!bus->bus_client) + if (!bus->bus_client || bus->is_kernel) return 0; r = sd_bus_message_new_method_call( @@ -244,17 +389,13 @@ static int bus_send_hello(sd_bus *bus) { if (r < 0) return r; - r = sd_bus_send_with_reply(bus, m, hello_callback, NULL, 0, NULL); - if (r < 0) - return r; - - return r; + return sd_bus_send_with_reply(bus, m, hello_callback, NULL, 0, &bus->hello_serial); } int bus_start_running(sd_bus *bus) { assert(bus); - if (bus->bus_client) { + if (bus->bus_client && !bus->is_kernel) { bus->state = BUS_HELLO; return 1; } @@ -412,8 +553,11 @@ static int parse_unix_address(sd_bus *b, const char **p, char **guid) { static int parse_tcp_address(sd_bus *b, const char **p, char **guid) { _cleanup_free_ char *host = NULL, *port = NULL, *family = NULL; - struct addrinfo hints, *result; int r; + struct addrinfo *result, hints = { + .ai_socktype = SOCK_STREAM, + .ai_flags = AI_ADDRCONFIG, + }; assert(b); assert(p); @@ -451,10 +595,6 @@ static int parse_tcp_address(sd_bus *b, const char **p, char **guid) { if (!host || !port) return -EINVAL; - zero(hints); - hints.ai_socktype = SOCK_STREAM; - hints.ai_flags = AI_ADDRCONFIG; - if (family) { if (streq(family, "ipv4")) hints.ai_family = AF_INET; @@ -573,6 +713,41 @@ fail: return r; } +static int parse_kernel_address(sd_bus *b, const char **p, char **guid) { + _cleanup_free_ char *path = NULL; + int r; + + assert(b); + assert(p); + assert(*p); + assert(guid); + + while (**p != 0 && **p != ';') { + r = parse_address_key(p, "guid", guid); + if (r < 0) + return r; + else if (r > 0) + continue; + + r = parse_address_key(p, "path", &path); + if (r < 0) + return r; + else if (r > 0) + continue; + + skip_address_key(p); + } + + if (!path) + return -EINVAL; + + free(b->kernel); + b->kernel = path; + path = NULL; + + return 0; +} + static void bus_reset_parsed_address(sd_bus *b) { assert(b); @@ -582,7 +757,9 @@ static void bus_reset_parsed_address(sd_bus *b) { free(b->exec_path); b->exec_path = NULL; b->exec_argv = NULL; - b->peer = SD_ID128_NULL; + b->server_id = SD_ID128_NULL; + free(b->kernel); + b->kernel = NULL; } static int bus_parse_next_address(sd_bus *b) { @@ -634,6 +811,14 @@ static int bus_parse_next_address(sd_bus *b) { break; + } else if (startswith(a, "kernel:")) { + + a += 7; + r = parse_kernel_address(b, &a, &guid); + if (r < 0) + return r; + + break; } a = strchr(a, ';'); @@ -642,7 +827,7 @@ static int bus_parse_next_address(sd_bus *b) { } if (guid) { - r = sd_id128_from_string(guid, &b->peer); + r = sd_id128_from_string(guid, &b->server_id); if (r < 0) return r; } @@ -657,10 +842,7 @@ static int bus_start_address(sd_bus *b) { assert(b); for (;;) { - if (b->fd >= 0) { - close_nointr_nofail(b->fd); - b->fd = -1; - } + sd_bus_close(b); if (b->sockaddr.sa.sa_family != AF_UNSPEC) { @@ -676,6 +858,13 @@ static int bus_start_address(sd_bus *b) { if (r >= 0) return r; + b->last_connect_error = -r; + } else if (b->kernel) { + + r = bus_kernel_connect(b); + if (r >= 0) + return r; + b->last_connect_error = -r; } @@ -695,34 +884,55 @@ int bus_next_address(sd_bus *b) { } static int bus_start_fd(sd_bus *b) { + struct stat st; int r; assert(b); + assert(b->input_fd >= 0); + assert(b->output_fd >= 0); - r = fd_nonblock(b->fd, true); + r = fd_nonblock(b->input_fd, true); if (r < 0) return r; - r = fd_cloexec(b->fd, true); + r = fd_cloexec(b->input_fd, true); if (r < 0) return r; - return bus_socket_take_fd(b); + if (b->input_fd != b->output_fd) { + r = fd_nonblock(b->output_fd, true); + if (r < 0) + return r; + + r = fd_cloexec(b->output_fd, true); + if (r < 0) + return r; + } + + if (fstat(b->input_fd, &st) < 0) + return -errno; + + if (S_ISCHR(b->input_fd)) + return bus_kernel_take_fd(b); + else + return bus_socket_take_fd(b); } int sd_bus_start(sd_bus *bus) { int r; - if (!bus) - return -EINVAL; - if (bus->state != BUS_UNSET) - return -EPERM; + assert_return(bus, -EINVAL); + assert_return(bus->state == BUS_UNSET, -EPERM); + assert_return(!bus_pid_changed(bus), -ECHILD); bus->state = BUS_OPENING; - if (bus->fd >= 0) + if (bus->is_server && bus->bus_client) + return -EINVAL; + + if (bus->input_fd >= 0) r = bus_start_fd(bus); - else if (bus->address) + else if (bus->address || bus->sockaddr.sa.sa_family != AF_UNSPEC || bus->exec_path || bus->kernel) r = bus_start_address(bus); else return -EINVAL; @@ -738,14 +948,13 @@ int sd_bus_open_system(sd_bus **ret) { sd_bus *b; int r; - if (!ret) - return -EINVAL; + assert_return(ret, -EINVAL); r = sd_bus_new(&b); if (r < 0) return r; - e = getenv("DBUS_SYSTEM_BUS_ADDRESS"); + e = secure_getenv("DBUS_SYSTEM_BUS_ADDRESS"); if (e) { r = sd_bus_set_address(b, e); if (r < 0) @@ -776,20 +985,19 @@ int sd_bus_open_user(sd_bus **ret) { size_t l; int r; - if (!ret) - return -EINVAL; + assert_return(ret, -EINVAL); r = sd_bus_new(&b); if (r < 0) return r; - e = getenv("DBUS_SESSION_BUS_ADDRESS"); + e = secure_getenv("DBUS_SESSION_BUS_ADDRESS"); if (e) { r = sd_bus_set_address(b, e); if (r < 0) goto fail; } else { - e = getenv("XDG_RUNTIME_DIR"); + e = secure_getenv("XDG_RUNTIME_DIR"); if (!e) { r = -ENOENT; goto fail; @@ -823,20 +1031,29 @@ fail: void sd_bus_close(sd_bus *bus) { if (!bus) return; - if (bus->fd < 0) + if (bus->state == BUS_CLOSED) + return; + if (bus_pid_changed(bus)) return; - close_nointr_nofail(bus->fd); - bus->fd = -1; + bus->state = BUS_CLOSED; + + if (!bus->is_kernel) + bus_close_fds(bus); + + /* We'll leave the fd open in case this is a kernel bus, since + * there might still be memblocks around that reference this + * bus, and they might need to invoke the + * KDBUS_CMD_MSG_RELEASE ioctl on the fd when they are + * freed. */ } sd_bus *sd_bus_ref(sd_bus *bus) { if (!bus) return NULL; - assert(bus->n_ref > 0); + assert_se(REFCNT_INC(bus->n_ref) >= 2); - bus->n_ref++; return bus; } @@ -844,32 +1061,29 @@ sd_bus *sd_bus_unref(sd_bus *bus) { if (!bus) return NULL; - assert(bus->n_ref > 0); - bus->n_ref--; - - if (bus->n_ref <= 0) + if (REFCNT_DEC(bus->n_ref) <= 0) bus_free(bus); return NULL; } int sd_bus_is_open(sd_bus *bus) { - if (!bus) - return -EINVAL; - return bus->state != BUS_UNSET && bus->fd >= 0; + assert_return(bus, -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); + + return BUS_IS_OPEN(bus->state); } int sd_bus_can_send(sd_bus *bus, char type) { int r; - if (!bus) - return -EINVAL; - if (bus->fd < 0) - return -ENOTCONN; + assert_return(bus, -EINVAL); + assert_return(bus->state != BUS_UNSET, -ENOTCONN); + assert_return(!bus_pid_changed(bus), -ECHILD); if (type == SD_BUS_TYPE_UNIX_FD) { - if (!bus->negotiate_fds) + if (!(bus->hello_flags & KDBUS_HELLO_ACCEPT_FD)) return 0; r = bus_ensure_running(bus); @@ -882,19 +1096,18 @@ int sd_bus_can_send(sd_bus *bus, char type) { return bus_type_is_valid(type); } -int sd_bus_get_peer(sd_bus *bus, sd_id128_t *peer) { +int sd_bus_get_server_id(sd_bus *bus, sd_id128_t *server_id) { int r; - if (!bus) - return -EINVAL; - if (!peer) - return -EINVAL; + assert_return(bus, -EINVAL); + assert_return(server_id, -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); r = bus_ensure_running(bus); if (r < 0) return r; - *peer = bus->peer; + *server_id = bus->server_id; return 0; } @@ -916,19 +1129,20 @@ static int dispatch_wqueue(sd_bus *bus) { assert(bus); assert(bus->state == BUS_RUNNING || bus->state == BUS_HELLO); - if (bus->fd < 0) - return -ENOTCONN; - while (bus->wqueue_size > 0) { - r = bus_socket_write_message(bus, bus->wqueue[0], &bus->windex); + if (bus->is_kernel) + r = bus_kernel_write_message(bus, bus->wqueue[0]); + else + r = bus_socket_write_message(bus, bus->wqueue[0], &bus->windex); + if (r < 0) { sd_bus_close(bus); return r; } else if (r == 0) /* Didn't do anything this time */ return ret; - else if (bus->windex >= bus->wqueue[0]->size) { + else if (bus->is_kernel || bus->windex >= BUS_MESSAGE_SIZE(bus->wqueue[0])) { /* Fully written. Let's drop the entry from * the queue. * @@ -959,9 +1173,6 @@ static int dispatch_rqueue(sd_bus *bus, sd_bus_message **m) { assert(m); assert(bus->state == BUS_RUNNING || bus->state == BUS_HELLO); - if (bus->fd < 0) - return -ENOTCONN; - if (bus->rqueue_size > 0) { /* Dispatch a queued message */ @@ -973,7 +1184,11 @@ static int dispatch_rqueue(sd_bus *bus, sd_bus_message **m) { /* Try to read a new message */ do { - r = bus_socket_read_message(bus, &z); + if (bus->is_kernel) + r = bus_kernel_read_message(bus, &z); + else + r = bus_socket_read_message(bus, &z); + if (r < 0) { sd_bus_close(bus); return r; @@ -981,24 +1196,20 @@ static int dispatch_rqueue(sd_bus *bus, sd_bus_message **m) { if (r == 0) return ret; - r = 1; + ret = 1; } while (!z); *m = z; - return 1; + return ret; } int sd_bus_send(sd_bus *bus, sd_bus_message *m, uint64_t *serial) { int r; - if (!bus) - return -EINVAL; - if (bus->state == BUS_UNSET) - return -ENOTCONN; - if (bus->fd < 0) - return -ENOTCONN; - if (!m) - return -EINVAL; + assert_return(bus, -EINVAL); + assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN); + assert_return(m, -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); if (m->n_fds > 0) { r = sd_bus_can_send(bus, SD_BUS_TYPE_UNIX_FD); @@ -1025,11 +1236,15 @@ int sd_bus_send(sd_bus *bus, sd_bus_message *m, uint64_t *serial) { if ((bus->state == BUS_RUNNING || bus->state == BUS_HELLO) && bus->wqueue_size <= 0) { size_t idx = 0; - r = bus_socket_write_message(bus, m, &idx); + if (bus->is_kernel) + r = bus_kernel_write_message(bus, m); + else + r = bus_socket_write_message(bus, m, &idx); + if (r < 0) { sd_bus_close(bus); return r; - } else if (idx < m->size) { + } else if (!bus->is_kernel && idx < BUS_MESSAGE_SIZE(m)) { /* Wasn't fully written. So let's remember how * much was written. Note that the first entry * of the wqueue array is always allocated so @@ -1092,7 +1307,7 @@ static int timeout_compare(const void *a, const void *b) { int sd_bus_send_with_reply( sd_bus *bus, sd_bus_message *m, - sd_message_handler_t callback, + sd_bus_message_handler_t callback, void *userdata, uint64_t usec, uint64_t *serial) { @@ -1100,20 +1315,13 @@ int sd_bus_send_with_reply( struct reply_callback *c; int r; - if (!bus) - return -EINVAL; - if (bus->state == BUS_UNSET) - return -ENOTCONN; - if (bus->fd < 0) - return -ENOTCONN; - if (!m) - return -EINVAL; - if (!callback) - return -EINVAL; - if (m->header->type != SD_BUS_MESSAGE_TYPE_METHOD_CALL) - return -EINVAL; - if (m->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED) - return -EINVAL; + assert_return(bus, -EINVAL); + assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN); + assert_return(m, -EINVAL); + assert_return(m->header->type == SD_BUS_MESSAGE_TYPE_METHOD_CALL, -EINVAL); + assert_return(!(m->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED), -EINVAL); + assert_return(callback, -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); r = hashmap_ensure_allocated(&bus->reply_callbacks, uint64_hash_func, uint64_compare_func); if (r < 0) @@ -1129,7 +1337,7 @@ int sd_bus_send_with_reply( if (r < 0) return r; - c = new(struct reply_callback, 1); + c = new0(struct reply_callback, 1); if (!c) return -ENOMEM; @@ -1165,10 +1373,9 @@ int sd_bus_send_with_reply( int sd_bus_send_with_reply_cancel(sd_bus *bus, uint64_t serial) { struct reply_callback *c; - if (!bus) - return -EINVAL; - if (serial == 0) - return -EINVAL; + assert_return(bus, -EINVAL); + assert_return(serial != 0, -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); c = hashmap_remove(bus->reply_callbacks, &serial); if (!c) @@ -1186,11 +1393,8 @@ int bus_ensure_running(sd_bus *bus) { assert(bus); - if (bus->fd < 0) + if (bus->state == BUS_UNSET || bus->state == BUS_CLOSED) return -ENOTCONN; - if (bus->state == BUS_UNSET) - return -ENOTCONN; - if (bus->state == BUS_RUNNING) return 1; @@ -1221,20 +1425,13 @@ int sd_bus_send_with_reply_and_block( uint64_t serial; bool room = false; - if (!bus) - return -EINVAL; - if (bus->fd < 0) - return -ENOTCONN; - if (bus->state == BUS_UNSET) - return -ENOTCONN; - if (!m) - return -EINVAL; - if (m->header->type != SD_BUS_MESSAGE_TYPE_METHOD_CALL) - return -EINVAL; - if (m->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED) - return -EINVAL; - if (bus_error_is_dirty(error)) - return -EINVAL; + assert_return(bus, -EINVAL); + assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN); + assert_return(m, -EINVAL); + assert_return(m->header->type == SD_BUS_MESSAGE_TYPE_METHOD_CALL, -EINVAL); + assert_return(!(m->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED), -EINVAL); + assert_return(!bus_error_is_dirty(error), -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); r = bus_ensure_running(bus); if (r < 0) @@ -1267,7 +1464,10 @@ int sd_bus_send_with_reply_and_block( room = true; } - r = bus_socket_read_message(bus, &incoming); + if (bus->is_kernel) + r = bus_kernel_read_message(bus, &incoming); + else + r = bus_socket_read_message(bus, &incoming); if (r < 0) return r; if (incoming) { @@ -1276,7 +1476,12 @@ int sd_bus_send_with_reply_and_block( /* Found a match! */ if (incoming->header->type == SD_BUS_MESSAGE_TYPE_METHOD_RETURN) { - *reply = incoming; + + if (reply) + *reply = incoming; + else + sd_bus_message_unref(incoming); + return 0; } @@ -1331,30 +1536,27 @@ int sd_bus_send_with_reply_and_block( } int sd_bus_get_fd(sd_bus *bus) { - if (!bus) - return -EINVAL; - if (bus->fd < 0) - return -ENOTCONN; + assert_return(bus, -EINVAL); + assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN); + assert_return(bus->input_fd == bus->output_fd, -EPERM); + assert_return(!bus_pid_changed(bus), -ECHILD); - return bus->fd; + return bus->input_fd; } int sd_bus_get_events(sd_bus *bus) { int flags = 0; - if (!bus) - return -EINVAL; - if (bus->state == BUS_UNSET) - return -ENOTCONN; - if (bus->fd < 0) - return -ENOTCONN; + assert_return(bus, -EINVAL); + assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN); + assert_return(!bus_pid_changed(bus), -ECHILD); if (bus->state == BUS_OPENING) flags |= POLLOUT; else if (bus->state == BUS_AUTHENTICATING) { - if (bus->auth_index < ELEMENTSOF(bus->auth_iovec)) + if (bus_socket_auth_needs_write(bus)) flags |= POLLOUT; flags |= POLLIN; @@ -1372,32 +1574,33 @@ int sd_bus_get_events(sd_bus *bus) { int sd_bus_get_timeout(sd_bus *bus, uint64_t *timeout_usec) { struct reply_callback *c; - if (!bus) - return -EINVAL; - if (!timeout_usec) - return -EINVAL; - if (bus->state == BUS_UNSET) - return -ENOTCONN; - if (bus->fd < 0) - return -ENOTCONN; + assert_return(bus, -EINVAL); + assert_return(timeout_usec, -EINVAL); + assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN); + assert_return(!bus_pid_changed(bus), -ECHILD); if (bus->state == BUS_AUTHENTICATING) { *timeout_usec = bus->auth_timeout; return 1; } - if (bus->state != BUS_RUNNING && bus->state != BUS_HELLO) + if (bus->state != BUS_RUNNING && bus->state != BUS_HELLO) { + *timeout_usec = (uint64_t) -1; return 0; + } c = prioq_peek(bus->reply_callbacks_prioq); - if (!c) + if (!c) { + *timeout_usec = (uint64_t) -1; return 0; + } *timeout_usec = c->timeout; return 1; } static int process_timeout(sd_bus *bus) { + _cleanup_bus_message_unref_ sd_bus_message* m = NULL; struct reply_callback *c; usec_t n; int r; @@ -1412,15 +1615,45 @@ static int process_timeout(sd_bus *bus) { if (c->timeout > n) return 0; + r = bus_message_new_synthetic_error( + bus, + c->serial, + &SD_BUS_ERROR_MAKE("org.freedesktop.DBus.Error.Timeout", "Timed out"), + &m); + if (r < 0) + return r; + assert_se(prioq_pop(bus->reply_callbacks_prioq) == c); hashmap_remove(bus->reply_callbacks, &c->serial); - r = c->callback(bus, ETIMEDOUT, NULL, c->userdata); + r = c->callback(bus, m, c->userdata); free(c); return r < 0 ? r : 1; } +static int process_hello(sd_bus *bus, sd_bus_message *m) { + assert(bus); + assert(m); + + if (bus->state != BUS_HELLO) + return 0; + + /* Let's make sure the first message on the bus is the HELLO + * reply. But note that we don't actually parse the message + * here (we leave that to the usual handling), we just verify + * we don't let any earlier msg through. */ + + if (m->header->type != SD_BUS_MESSAGE_TYPE_METHOD_RETURN && + m->header->type != SD_BUS_MESSAGE_TYPE_METHOD_ERROR) + return -EIO; + + if (m->reply_serial != bus->hello_serial) + return -EIO; + + return 0; +} + static int process_reply(sd_bus *bus, sd_bus_message *m) { struct reply_callback *c; int r; @@ -1439,7 +1672,11 @@ static int process_reply(sd_bus *bus, sd_bus_message *m) { if (c->timeout != 0) prioq_remove(bus->reply_callbacks_prioq, c, &c->prioq_idx); - r = c->callback(bus, 0, m, c->userdata); + r = sd_bus_message_rewind(m, true); + if (r < 0) + return r; + + r = c->callback(bus, m, c->userdata); free(c); return r; @@ -1449,11 +1686,52 @@ static int process_filter(sd_bus *bus, sd_bus_message *m) { struct filter_callback *l; int r; - LIST_FOREACH(callbacks, l, bus->filter_callbacks) { - r = l->callback(bus, 0, m, l->userdata); + assert(bus); + assert(m); + + do { + bus->filter_callbacks_modified = false; + + LIST_FOREACH(callbacks, l, bus->filter_callbacks) { + + if (bus->filter_callbacks_modified) + break; + + /* Don't run this more than once per iteration */ + if (l->last_iteration == bus->iteration_counter) + continue; + + l->last_iteration = bus->iteration_counter; + + r = sd_bus_message_rewind(m, true); + if (r < 0) + return r; + + r = l->callback(bus, m, l->userdata); + if (r != 0) + return r; + + } + + } while (bus->filter_callbacks_modified); + + return 0; +} + +static int process_match(sd_bus *bus, sd_bus_message *m) { + int r; + + assert(bus); + assert(m); + + do { + bus->match_callbacks_modified = false; + + r = bus_match_run(bus, &bus->match_callbacks, m); if (r != 0) return r; - } + + } while (bus->match_callbacks_modified); return 0; } @@ -1490,83 +1768,12 @@ static int process_builtin(sd_bus *bus, sd_bus_message *m) { r = sd_bus_message_append(reply, "s", sd_id128_to_string(id, sid)); } else { - _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_INIT; - - sd_bus_error_set(&error, - "org.freedesktop.DBus.Error.UnknownMethod", + r = sd_bus_message_new_method_errorf( + bus, m, &reply, + "org.freedesktop.DBus.Error.UnknownMethod", "Unknown method '%s' on interface '%s'.", m->member, m->interface); - - r = sd_bus_message_new_method_error(bus, m, &error, &reply); - } - - if (r < 0) - return r; - - r = sd_bus_send(bus, reply, NULL); - if (r < 0) - return r; - - return 1; -} - -static int process_object(sd_bus *bus, sd_bus_message *m) { - _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_INIT; - _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; - struct object_callback *c; - char *p; - int r; - bool found = false; - - assert(bus); - assert(m); - - if (m->header->type != SD_BUS_MESSAGE_TYPE_METHOD_CALL) - return 0; - - if (hashmap_isempty(bus->object_callbacks)) - return 0; - - c = hashmap_get(bus->object_callbacks, m->path); - if (c) { - r = c->callback(bus, 0, m, c->userdata); - if (r != 0) - return r; - - found = true; - } - - /* Look for fallback prefixes */ - p = strdupa(m->path); - for (;;) { - char *e; - - e = strrchr(p, '/'); - if (e == p || !e) - break; - - *e = 0; - - c = hashmap_get(bus->object_callbacks, p); - if (c && c->is_fallback) { - r = c->callback(bus, 0, m, c->userdata); - if (r != 0) - return r; - - found = true; - } } - /* We found some handlers but none wanted to take this, then - * return this -- with one exception, we can handle - * introspection minimally ourselves */ - if (!found || sd_bus_message_is_method_call(m, "org.freedesktop.DBus.Introspectable", "Introspect")) - return 0; - - sd_bus_error_set(&error, - "org.freedesktop.DBus.Error.UnknownMethod", - "Unknown method '%s' or interface '%s'.", m->member, m->interface); - - r = sd_bus_message_new_method_error(bus, m, &error, &reply); if (r < 0) return r; @@ -1577,104 +1784,18 @@ static int process_object(sd_bus *bus, sd_bus_message *m) { return 1; } -static int process_introspect(sd_bus *bus, sd_bus_message *m) { - _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; - _cleanup_free_ char *introspection = NULL; - _cleanup_set_free_free_ Set *s = NULL; - _cleanup_fclose_ FILE *f = NULL; - struct object_callback *c; - Iterator i; - size_t size = 0; - char *node; +static int process_message(sd_bus *bus, sd_bus_message *m) { int r; assert(bus); assert(m); - if (!sd_bus_message_is_method_call(m, "org.freedesktop.DBus.Introspectable", "Introspect")) - return 0; - - if (!m->path) - return 0; - - s = set_new(string_hash_func, string_compare_func); - if (!s) - return -ENOMEM; - - HASHMAP_FOREACH(c, bus->object_callbacks, i) { - const char *e; - char *a, *p; - - if (streq(c->path, "/")) - continue; - - if (streq(m->path, "/")) - e = c->path; - else { - e = startswith(c->path, m->path); - if (!e || *e != '/') - continue; - } - - a = strdup(e+1); - if (!a) - return -ENOMEM; - - p = strchr(a, '/'); - if (p) - *p = 0; + bus->iteration_counter++; - r = set_put(s, a); - if (r < 0) { - free(a); - - if (r != -EEXIST) - return r; - } - } - - f = open_memstream(&introspection, &size); - if (!f) - return -ENOMEM; - - fputs(SD_BUS_INTROSPECT_DOCTYPE, f); - fputs("\n", f); - fputs(SD_BUS_INTROSPECT_INTERFACE_PEER, f); - fputs(SD_BUS_INTROSPECT_INTERFACE_INTROSPECTABLE, f); - - while ((node = set_steal_first(s))) { - fprintf(f, " \n", node); - free(node); - } - - fputs("\n", f); - - fflush(f); - - if (ferror(f)) - return -ENOMEM; - - r = sd_bus_message_new_method_return(bus, m, &reply); - if (r < 0) - return r; - - r = sd_bus_message_append(reply, "s", introspection); - if (r < 0) - return r; - - r = sd_bus_send(bus, reply, NULL); - if (r < 0) + r = process_hello(bus, m); + if (r != 0) return r; - return 1; -} - -static int process_message(sd_bus *bus, sd_bus_message *m) { - int r; - - assert(bus); - assert(m); - r = process_reply(bus, m); if (r != 0) return r; @@ -1683,15 +1804,15 @@ static int process_message(sd_bus *bus, sd_bus_message *m) { if (r != 0) return r; - r = process_builtin(bus, m); + r = process_match(bus, m); if (r != 0) return r; - r = process_object(bus, m); + r = process_builtin(bus, m); if (r != 0) return r; - return process_introspect(bus, m); + return bus_process_object(bus, m); } static int process_running(sd_bus *bus, sd_bus_message **ret) { @@ -1720,22 +1841,21 @@ static int process_running(sd_bus *bus, sd_bus_message **ret) { goto null_message; if (ret) { + r = sd_bus_message_rewind(m, true); + if (r < 0) + return r; + *ret = m; m = NULL; return 1; } if (m->header->type == SD_BUS_MESSAGE_TYPE_METHOD_CALL) { - _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; - _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_INIT; - sd_bus_error_set(&error, "org.freedesktop.DBus.Error.UnknownObject", "Unknown object '%s'.", m->path); - - r = sd_bus_message_new_method_error(bus, m, &error, &reply); - if (r < 0) - return r; - - r = sd_bus_send(bus, reply, NULL); + r = sd_bus_reply_method_errorf( + bus, m, + "org.freedesktop.DBus.Error.UnknownObject", + "Unknown object '%s'.", m->path); if (r < 0) return r; } @@ -1750,6 +1870,7 @@ null_message: } int sd_bus_process(sd_bus *bus, sd_bus_message **ret) { + BUS_DONT_DESTROY(bus); int r; /* Returns 0 when we didn't do anything. This should cause the @@ -1757,14 +1878,16 @@ int sd_bus_process(sd_bus *bus, sd_bus_message **ret) { * time. Returns > 0 when we did something, which possibly * means *ret is filled in with an unprocessed message. */ - if (!bus) - return -EINVAL; - if (bus->fd < 0) - return -ENOTCONN; + assert_return(bus, -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); + + /* We don't allow recursively invoking sd_bus_process(). */ + assert_return(!bus->processing, -EBUSY); switch (bus->state) { case BUS_UNSET: + case BUS_CLOSED: return -ENOTCONN; case BUS_OPENING: @@ -1787,22 +1910,24 @@ int sd_bus_process(sd_bus *bus, sd_bus_message **ret) { case BUS_RUNNING: case BUS_HELLO: - return process_running(bus, ret); + bus->processing = true; + r = process_running(bus, ret); + bus->processing = false; + + return r; } assert_not_reached("Unknown state"); } static int bus_poll(sd_bus *bus, bool need_more, uint64_t timeout_usec) { - struct pollfd p; - int r, e; + struct pollfd p[2] = {}; + int r, e, n; struct timespec ts; usec_t until, m; assert(bus); - - if (bus->fd < 0) - return -ENOTCONN; + assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN); e = sd_bus_get_events(bus); if (e < 0) @@ -1817,19 +1942,26 @@ static int bus_poll(sd_bus *bus, bool need_more, uint64_t timeout_usec) { if (r == 0) m = (uint64_t) -1; else { - usec_t n; - n = now(CLOCK_MONOTONIC); - m = until > n ? until - n : 0; + usec_t nw; + nw = now(CLOCK_MONOTONIC); + m = until > nw ? until - nw : 0; } if (timeout_usec != (uint64_t) -1 && (m == (uint64_t) -1 || timeout_usec < m)) m = timeout_usec; - zero(p); - p.fd = bus->fd; - p.events = e; + p[0].fd = bus->input_fd; + if (bus->output_fd == bus->input_fd) { + p[0].events = e; + n = 1; + } else { + p[0].events = e & POLLIN; + p[1].fd = bus->output_fd; + p[1].events = e & POLLOUT; + n = 2; + } - r = ppoll(&p, 1, m == (uint64_t) -1 ? NULL : timespec_store(&ts, m), NULL); + r = ppoll(p, n, m == (uint64_t) -1 ? NULL : timespec_store(&ts, m), NULL); if (r < 0) return -errno; @@ -1838,12 +1970,10 @@ static int bus_poll(sd_bus *bus, bool need_more, uint64_t timeout_usec) { int sd_bus_wait(sd_bus *bus, uint64_t timeout_usec) { - if (!bus) - return -EINVAL; - if (bus->state == BUS_UNSET) - return -ENOTCONN; - if (bus->fd < 0) - return -ENOTCONN; + assert_return(bus, -EINVAL); + assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN); + assert_return(!bus_pid_changed(bus), -ECHILD); + if (bus->rqueue_size > 0) return 0; @@ -1853,12 +1983,9 @@ int sd_bus_wait(sd_bus *bus, uint64_t timeout_usec) { int sd_bus_flush(sd_bus *bus) { int r; - if (!bus) - return -EINVAL; - if (bus->state == BUS_UNSET) - return -ENOTCONN; - if (bus->fd < 0) - return -ENOTCONN; + assert_return(bus, -EINVAL); + assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN); + assert_return(!bus_pid_changed(bus), -ECHILD); r = bus_ensure_running(bus); if (r < 0) @@ -1881,35 +2008,35 @@ int sd_bus_flush(sd_bus *bus) { } } -int sd_bus_add_filter(sd_bus *bus, sd_message_handler_t callback, void *userdata) { +int sd_bus_add_filter(sd_bus *bus, sd_bus_message_handler_t callback, void *userdata) { struct filter_callback *f; - if (!bus) - return -EINVAL; - if (!callback) - return -EINVAL; + assert_return(bus, -EINVAL); + assert_return(callback, -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); - f = new(struct filter_callback, 1); + f = new0(struct filter_callback, 1); if (!f) return -ENOMEM; f->callback = callback; f->userdata = userdata; - LIST_PREPEND(struct filter_callback, callbacks, bus->filter_callbacks, f); + bus->filter_callbacks_modified = true; + LIST_PREPEND(callbacks, bus->filter_callbacks, f); return 0; } -int sd_bus_remove_filter(sd_bus *bus, sd_message_handler_t callback, void *userdata) { +int sd_bus_remove_filter(sd_bus *bus, sd_bus_message_handler_t callback, void *userdata) { struct filter_callback *f; - if (!bus) - return -EINVAL; - if (!callback) - return -EINVAL; + assert_return(bus, -EINVAL); + assert_return(callback, -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); LIST_FOREACH(callbacks, f, bus->filter_callbacks) { if (f->callback == callback && f->userdata == userdata) { - LIST_REMOVE(struct filter_callback, callbacks, bus->filter_callbacks, f); + bus->filter_callbacks_modified = true; + LIST_REMOVE(callbacks, bus->filter_callbacks, f); free(f); return 1; } @@ -1918,94 +2045,70 @@ int sd_bus_remove_filter(sd_bus *bus, sd_message_handler_t callback, void *userd return 0; } -static int bus_add_object( - sd_bus *bus, - bool fallback, - const char *path, - sd_message_handler_t callback, - void *userdata) { - - struct object_callback *c; - int r; +int sd_bus_add_match(sd_bus *bus, const char *match, sd_bus_message_handler_t callback, void *userdata) { + struct bus_match_component *components = NULL; + unsigned n_components = 0; + uint64_t cookie = 0; + int r = 0; - if (!bus) - return -EINVAL; - if (!path) - return -EINVAL; - if (!callback) - return -EINVAL; + assert_return(bus, -EINVAL); + assert_return(match, -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); - r = hashmap_ensure_allocated(&bus->object_callbacks, string_hash_func, string_compare_func); + r = bus_match_parse(match, &components, &n_components); if (r < 0) - return r; + goto finish; - c = new(struct object_callback, 1); - if (!c) - return -ENOMEM; + if (bus->bus_client) { + cookie = ++bus->match_cookie; - c->path = strdup(path); - if (!c->path) { - free(c); - return -ENOMEM; + r = bus_add_match_internal(bus, match, components, n_components, cookie); + if (r < 0) + goto finish; } - c->callback = callback; - c->userdata = userdata; - c->is_fallback = fallback; - - r = hashmap_put(bus->object_callbacks, c->path, c); + bus->match_callbacks_modified = true; + r = bus_match_add(&bus->match_callbacks, components, n_components, callback, userdata, cookie, NULL); if (r < 0) { - free(c->path); - free(c); - return r; + if (bus->bus_client) + bus_remove_match_internal(bus, match, cookie); } - return 0; +finish: + bus_match_parse_free(components, n_components); + return r; } -static int bus_remove_object( - sd_bus *bus, - bool fallback, - const char *path, - sd_message_handler_t callback, - void *userdata) { - - struct object_callback *c; - - if (!bus) - return -EINVAL; - if (!path) - return -EINVAL; - if (!callback) - return -EINVAL; +int sd_bus_remove_match(sd_bus *bus, const char *match, sd_bus_message_handler_t callback, void *userdata) { + struct bus_match_component *components = NULL; + unsigned n_components = 0; + int r = 0, q = 0; + uint64_t cookie = 0; - c = hashmap_get(bus->object_callbacks, path); - if (!c) - return 0; + assert_return(bus, -EINVAL); + assert_return(match, -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); - if (c->callback != callback || c->userdata != userdata || c->is_fallback != fallback) - return 0; + r = bus_match_parse(match, &components, &n_components); + if (r < 0) + return r; - assert_se(c == hashmap_remove(bus->object_callbacks, c->path)); + bus->match_callbacks_modified = true; + r = bus_match_remove(&bus->match_callbacks, components, n_components, callback, userdata, &cookie); - free(c->path); - free(c); + if (bus->bus_client) + q = bus_remove_match_internal(bus, match, cookie); - return 1; -} + bus_match_parse_free(components, n_components); -int sd_bus_add_object(sd_bus *bus, const char *path, sd_message_handler_t callback, void *userdata) { - return bus_add_object(bus, false, path, callback, userdata); + return r < 0 ? r : q; } -int sd_bus_remove_object(sd_bus *bus, const char *path, sd_message_handler_t callback, void *userdata) { - return bus_remove_object(bus, false, path, callback, userdata); -} +bool bus_pid_changed(sd_bus *bus) { + assert(bus); -int sd_bus_add_fallback(sd_bus *bus, const char *prefix, sd_message_handler_t callback, void *userdata) { - return bus_add_object(bus, true, prefix, callback, userdata); -} + /* We don't support people creating a bus connection and + * keeping it around over a fork(). Let's complain. */ -int sd_bus_remove_fallback(sd_bus *bus, const char *prefix, sd_message_handler_t callback, void *userdata) { - return bus_remove_object(bus, true, prefix, callback, userdata); + return bus->original_pid != getpid(); }