chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
event: rework sd-event exit logic
[elogind.git]
/
src
/
libsystemd-bus
/
sd-bus.c
diff --git
a/src/libsystemd-bus/sd-bus.c
b/src/libsystemd-bus/sd-bus.c
index 1244ec2f6dd051df9d04a3e434b2e45e5f4fd7b4..a4709a109b19428b7875fc62e1534b79960c493d 100644
(file)
--- a/
src/libsystemd-bus/sd-bus.c
+++ b/
src/libsystemd-bus/sd-bus.c
@@
-47,6
+47,7
@@
#include "bus-objects.h"
#include "bus-util.h"
#include "bus-container.h"
#include "bus-objects.h"
#include "bus-util.h"
#include "bus-container.h"
+#include "bus-protocol.h"
static int bus_poll(sd_bus *bus, bool need_more, uint64_t timeout_usec);
static int bus_poll(sd_bus *bus, bool need_more, uint64_t timeout_usec);
@@
-287,7
+288,7
@@
_public_ int sd_bus_negotiate_attach_timestamp(sd_bus *bus, int b) {
_public_ int sd_bus_negotiate_attach_creds(sd_bus *bus, uint64_t mask) {
assert_return(bus, -EINVAL);
_public_ int sd_bus_negotiate_attach_creds(sd_bus *bus, uint64_t mask) {
assert_return(bus, -EINVAL);
- assert_return(mask <= _SD_BUS_CREDS_
MAX
, -EINVAL);
+ assert_return(mask <= _SD_BUS_CREDS_
ALL
, -EINVAL);
assert_return(bus->state == BUS_UNSET, -EPERM);
assert_return(!bus_pid_changed(bus), -ECHILD);
assert_return(bus->state == BUS_UNSET, -EPERM);
assert_return(!bus_pid_changed(bus), -ECHILD);
@@
-317,6
+318,15
@@
_public_ int sd_bus_set_anonymous(sd_bus *bus, int b) {
return 0;
}
return 0;
}
+_public_ int sd_bus_set_trusted(sd_bus *bus, int b) {
+ assert_return(bus, -EINVAL);
+ assert_return(bus->state == BUS_UNSET, -EPERM);
+ assert_return(!bus_pid_changed(bus), -ECHILD);
+
+ bus->trusted = !!b;
+ return 0;
+}
+
static int hello_callback(sd_bus *bus, sd_bus_message *reply, void *userdata, sd_bus_error *error) {
const char *s;
int r;
static int hello_callback(sd_bus *bus, sd_bus_message *reply, void *userdata, sd_bus_error *error) {
const char *s;
int r;
@@
-754,6
+764,9
@@
static int parse_container_address(sd_bus *b, const char **p, char **guid) {
if (!machine)
return -EINVAL;
if (!machine)
return -EINVAL;
+ if (!filename_is_safe(machine))
+ return -EINVAL;
+
free(b->machine);
b->machine = machine;
machine = NULL;
free(b->machine);
b->machine = machine;
machine = NULL;
@@
-1004,6
+1017,11
@@
_public_ int sd_bus_open_system(sd_bus **ret) {
b->bus_client = true;
b->bus_client = true;
+ /* Let's do per-method access control on the system bus. We
+ * need the caller's UID and capability set for that. */
+ b->trusted = false;
+ b->attach_flags |= KDBUS_ATTACH_CAPS | KDBUS_ATTACH_CREDS;
+
r = sd_bus_start(b);
if (r < 0)
goto fail;
r = sd_bus_start(b);
if (r < 0)
goto fail;
@@
-1064,6
+1082,10
@@
_public_ int sd_bus_open_user(sd_bus **ret) {
b->bus_client = true;
b->bus_client = true;
+ /* We don't do any per-method access control on the user
+ * bus. */
+ b->trusted = true;
+
r = sd_bus_start(b);
if (r < 0)
goto fail;
r = sd_bus_start(b);
if (r < 0)
goto fail;
@@
-1120,12
+1142,17
@@
_public_ int sd_bus_open_system_container(const char *machine, sd_bus **ret) {
assert_return(machine, -EINVAL);
assert_return(ret, -EINVAL);
assert_return(machine, -EINVAL);
assert_return(ret, -EINVAL);
+ assert_return(filename_is_safe(machine), -EINVAL);
e = bus_address_escape(machine);
if (!e)
return -ENOMEM;
e = bus_address_escape(machine);
if (!e)
return -ENOMEM;
+#ifdef ENABLE_KDBUS
+ p = strjoin("kernel:path=/dev/kdbus/ns/machine-", e, "/0-system/bus;x-container:machine=", e, NULL);
+#else
p = strjoin("x-container:machine=", e, NULL);
p = strjoin("x-container:machine=", e, NULL);
+#endif
if (!p)
return -ENOMEM;
if (!p)
return -ENOMEM;
@@
-1195,7
+1222,9
@@
_public_ sd_bus *sd_bus_ref(sd_bus *bus) {
}
_public_ sd_bus *sd_bus_unref(sd_bus *bus) {
}
_public_ sd_bus *sd_bus_unref(sd_bus *bus) {
- assert_return(bus, NULL);
+
+ if (!bus)
+ return NULL;
if (REFCNT_DEC(bus->n_ref) <= 0)
bus_free(bus);
if (REFCNT_DEC(bus->n_ref) <= 0)
bus_free(bus);
@@
-1247,11
+1276,16
@@
_public_ int sd_bus_get_server_id(sd_bus *bus, sd_id128_t *server_id) {
return 0;
}
return 0;
}
-static int bus_seal_message(sd_bus *b, sd_bus_message *m) {
+static int bus_seal_message(sd_bus *b, sd_bus_message *m
, usec_t timeout
) {
assert(b);
assert(m);
assert(b);
assert(m);
- if (m->header->version > b->message_version)
+ if (b->message_version != 0 &&
+ m->header->version != b->message_version)
+ return -EPERM;
+
+ if (b->message_endian != 0 &&
+ m->header->endian != b->message_endian)
return -EPERM;
if (m->sealed) {
return -EPERM;
if (m->sealed) {
@@
-1262,16
+1296,16
@@
static int bus_seal_message(sd_bus *b, sd_bus_message *m) {
return 0;
}
return 0;
}
- return bus_message_seal(m, ++b->serial);
+ if (timeout == 0)
+ timeout = BUS_DEFAULT_TIMEOUT;
+
+ return bus_message_seal(m, ++b->serial, timeout);
}
int bus_seal_synthetic_message(sd_bus *b, sd_bus_message *m) {
assert(b);
assert(m);
}
int bus_seal_synthetic_message(sd_bus *b, sd_bus_message *m) {
assert(b);
assert(m);
- if (m->header->version > b->message_version)
- return -EPERM;
-
/* The bus specification says the serial number cannot be 0,
* hence let's fill something in for synthetic messages. Since
* synthetic messages might have a fake sender and we don't
/* The bus specification says the serial number cannot be 0,
* hence let's fill something in for synthetic messages. Since
* synthetic messages might have a fake sender and we don't
@@
-1280,12
+1314,10
@@
int bus_seal_synthetic_message(sd_bus *b, sd_bus_message *m) {
* than (uint64_t) -1 since dbus1 only had 32bit identifiers,
* even though kdbus can do 64bit. */
* than (uint64_t) -1 since dbus1 only had 32bit identifiers,
* even though kdbus can do 64bit. */
- return bus_message_seal(m, 0xFFFFFFFFULL);
+ return bus_message_seal(m, 0xFFFFFFFFULL
, 0
);
}
static int bus_write_message(sd_bus *bus, sd_bus_message *message, size_t *idx) {
}
static int bus_write_message(sd_bus *bus, sd_bus_message *message, size_t *idx) {
- int r;
-
assert(bus);
assert(message);
assert(bus);
assert(message);
@@
-1293,8
+1325,6
@@
static int bus_write_message(sd_bus *bus, sd_bus_message *message, size_t *idx)
return bus_kernel_write_message(bus, message);
else
return bus_socket_write_message(bus, message, idx);
return bus_kernel_write_message(bus, message);
else
return bus_socket_write_message(bus, message, idx);
-
- return r;
}
static int dispatch_wqueue(sd_bus *bus) {
}
static int dispatch_wqueue(sd_bus *bus) {
@@
-1412,9
+1442,9
@@
_public_ int sd_bus_send(sd_bus *bus, sd_bus_message *m, uint64_t *serial) {
/* If the serial number isn't kept, then we know that no reply
* is expected */
if (!serial && !m->sealed)
/* If the serial number isn't kept, then we know that no reply
* is expected */
if (!serial && !m->sealed)
- m->header->flags |=
SD_
BUS_MESSAGE_NO_REPLY_EXPECTED;
+ m->header->flags |= BUS_MESSAGE_NO_REPLY_EXPECTED;
- r = bus_seal_message(bus, m);
+ r = bus_seal_message(bus, m
, 0
);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-1489,9
+1519,6
@@
static usec_t calc_elapse(uint64_t usec) {
if (usec == (uint64_t) -1)
return 0;
if (usec == (uint64_t) -1)
return 0;
- if (usec == 0)
- usec = BUS_DEFAULT_TIMEOUT;
-
return now(CLOCK_MONOTONIC) + usec;
}
return now(CLOCK_MONOTONIC) + usec;
}
@@
-1528,7
+1555,7
@@
_public_ int sd_bus_call_async(
assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN);
assert_return(m, -EINVAL);
assert_return(m->header->type == SD_BUS_MESSAGE_METHOD_CALL, -EINVAL);
assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN);
assert_return(m, -EINVAL);
assert_return(m->header->type == SD_BUS_MESSAGE_METHOD_CALL, -EINVAL);
- assert_return(!(m->header->flags &
SD_
BUS_MESSAGE_NO_REPLY_EXPECTED), -EINVAL);
+ assert_return(!(m->header->flags & BUS_MESSAGE_NO_REPLY_EXPECTED), -EINVAL);
assert_return(callback, -EINVAL);
assert_return(!bus_pid_changed(bus), -ECHILD);
assert_return(callback, -EINVAL);
assert_return(!bus_pid_changed(bus), -ECHILD);
@@
-1536,13
+1563,11
@@
_public_ int sd_bus_call_async(
if (r < 0)
return r;
if (r < 0)
return r;
- if (usec != (uint64_t) -1) {
- r = prioq_ensure_allocated(&bus->reply_callbacks_prioq, timeout_compare);
- if (r < 0)
- return r;
- }
+ r = prioq_ensure_allocated(&bus->reply_callbacks_prioq, timeout_compare);
+ if (r < 0)
+ return r;
- r = bus_seal_message(bus, m);
+ r = bus_seal_message(bus, m
, usec
);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-1553,7
+1578,7
@@
_public_ int sd_bus_call_async(
c->callback = callback;
c->userdata = userdata;
c->serial = BUS_MESSAGE_SERIAL(m);
c->callback = callback;
c->userdata = userdata;
c->serial = BUS_MESSAGE_SERIAL(m);
- c->timeout = calc_elapse(
usec
);
+ c->timeout = calc_elapse(
m->timeout
);
r = hashmap_put(bus->reply_callbacks, &c->serial, c);
if (r < 0) {
r = hashmap_put(bus->reply_callbacks, &c->serial, c);
if (r < 0) {
@@
-1638,7
+1663,7
@@
_public_ int sd_bus_call(
assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN);
assert_return(m, -EINVAL);
assert_return(m->header->type == SD_BUS_MESSAGE_METHOD_CALL, -EINVAL);
assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN);
assert_return(m, -EINVAL);
assert_return(m->header->type == SD_BUS_MESSAGE_METHOD_CALL, -EINVAL);
- assert_return(!(m->header->flags &
SD_
BUS_MESSAGE_NO_REPLY_EXPECTED), -EINVAL);
+ assert_return(!(m->header->flags & BUS_MESSAGE_NO_REPLY_EXPECTED), -EINVAL);
assert_return(!bus_error_is_dirty(error), -EINVAL);
assert_return(!bus_pid_changed(bus), -ECHILD);
assert_return(!bus_error_is_dirty(error), -EINVAL);
assert_return(!bus_pid_changed(bus), -ECHILD);
@@
-1648,11
+1673,15
@@
_public_ int sd_bus_call(
i = bus->rqueue_size;
i = bus->rqueue_size;
+ r = bus_seal_message(bus, m, usec);
+ if (r < 0)
+ return r;
+
r = sd_bus_send(bus, m, &serial);
if (r < 0)
return r;
r = sd_bus_send(bus, m, &serial);
if (r < 0)
return r;
- timeout = calc_elapse(
usec
);
+ timeout = calc_elapse(
m->timeout
);
for (;;) {
usec_t left;
for (;;) {
usec_t left;
@@
-1729,6
+1758,8
@@
_public_ int sd_bus_call(
r = bus_poll(bus, true, left);
if (r < 0)
return r;
r = bus_poll(bus, true, left);
if (r < 0)
return r;
+ if (r == 0)
+ return -ETIMEDOUT;
r = dispatch_wqueue(bus);
if (r < 0) {
r = dispatch_wqueue(bus);
if (r < 0) {
@@
-1980,7
+2011,7
@@
static int process_builtin(sd_bus *bus, sd_bus_message *m) {
if (!streq_ptr(m->interface, "org.freedesktop.DBus.Peer"))
return 0;
if (!streq_ptr(m->interface, "org.freedesktop.DBus.Peer"))
return 0;
- if (m->header->flags &
SD_
BUS_MESSAGE_NO_REPLY_EXPECTED)
+ if (m->header->flags & BUS_MESSAGE_NO_REPLY_EXPECTED)
return 1;
if (streq_ptr(m->member, "Ping"))
return 1;
if (streq_ptr(m->member, "Ping"))
@@
-2615,7
+2646,7
@@
_public_ int sd_bus_attach_event(sd_bus *bus, sd_event *event, int priority) {
if (r < 0)
goto fail;
if (r < 0)
goto fail;
- r = sd_event_add_
qu
it(bus->event, quit_callback, bus, &bus->quit_event_source);
+ r = sd_event_add_
ex
it(bus->event, quit_callback, bus, &bus->quit_event_source);
if (r < 0)
goto fail;
if (r < 0)
goto fail;
@@
-2628,7
+2659,9
@@
fail:
_public_ int sd_bus_detach_event(sd_bus *bus) {
assert_return(bus, -EINVAL);
_public_ int sd_bus_detach_event(sd_bus *bus) {
assert_return(bus, -EINVAL);
- assert_return(bus->event, -ENXIO);
+
+ if (!bus->event)
+ return 0;
if (bus->input_io_event_source) {
sd_event_source_set_enabled(bus->input_io_event_source, SD_EVENT_OFF);
if (bus->input_io_event_source) {
sd_event_source_set_enabled(bus->input_io_event_source, SD_EVENT_OFF);
@@
-2653,7
+2686,7
@@
_public_ int sd_bus_detach_event(sd_bus *bus) {
if (bus->event)
bus->event = sd_event_unref(bus->event);
if (bus->event)
bus->event = sd_event_unref(bus->event);
- return
0
;
+ return
1
;
}
_public_ sd_event* sd_bus_get_event(sd_bus *bus) {
}
_public_ sd_event* sd_bus_get_event(sd_bus *bus) {
@@
-2801,7
+2834,7
@@
_public_ int sd_bus_get_peer_creds(sd_bus *bus, uint64_t mask, sd_bus_creds **re
int r;
assert_return(bus, -EINVAL);
int r;
assert_return(bus, -EINVAL);
- assert_return(mask <= _SD_BUS_CREDS_
MAX
, -ENOTSUP);
+ assert_return(mask <= _SD_BUS_CREDS_
ALL
, -ENOTSUP);
assert_return(ret, -EINVAL);
assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN);
assert_return(!bus_pid_changed(bus), -ECHILD);
assert_return(ret, -EINVAL);
assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN);
assert_return(!bus_pid_changed(bus), -ECHILD);