chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-bus: sync kdbus.h (ABI break)
[elogind.git]
/
src
/
libsystemd
/
sd-bus
/
bus-control.c
diff --git
a/src/libsystemd/sd-bus/bus-control.c
b/src/libsystemd/sd-bus/bus-control.c
index 2db1afb86d36246d6cfc408d2a32c1607f53a96d..c985b0e14a0f42299a98168594b5f60817eec984 100644
(file)
--- a/
src/libsystemd/sd-bus/bus-control.c
+++ b/
src/libsystemd/sd-bus/bus-control.c
@@
-34,7
+34,6
@@
#include "bus-bloom.h"
#include "bus-util.h"
#include "capability.h"
#include "bus-bloom.h"
#include "bus-util.h"
#include "capability.h"
-#include "cgroup-util.h"
_public_ int sd_bus_get_unique_name(sd_bus *bus, const char **unique) {
int r;
_public_ int sd_bus_get_unique_name(sd_bus *bus, const char **unique) {
int r;
@@
-52,7
+51,7
@@
_public_ int sd_bus_get_unique_name(sd_bus *bus, const char **unique) {
}
static int bus_request_name_kernel(sd_bus *bus, const char *name, uint64_t flags) {
}
static int bus_request_name_kernel(sd_bus *bus, const char *name, uint64_t flags) {
- struct kdbus_cmd
_name
*n;
+ struct kdbus_cmd *n;
size_t size, l;
int r;
size_t size, l;
int r;
@@
-60,7
+59,7
@@
static int bus_request_name_kernel(sd_bus *bus, const char *name, uint64_t flags
assert(name);
l = strlen(name) + 1;
assert(name);
l = strlen(name) + 1;
- size = offsetof(struct kdbus_cmd
_name
, items) + KDBUS_ITEM_SIZE(l);
+ size = offsetof(struct kdbus_cmd, items) + KDBUS_ITEM_SIZE(l);
n = alloca0_align(size, 8);
n->size = size;
n->flags = request_name_flags_to_kdbus(flags);
n = alloca0_align(size, 8);
n->size = size;
n->flags = request_name_flags_to_kdbus(flags);
@@
-77,7
+76,7
@@
static int bus_request_name_kernel(sd_bus *bus, const char *name, uint64_t flags
if (r < 0)
return -errno;
if (r < 0)
return -errno;
- if (n->flags & KDBUS_NAME_IN_QUEUE)
+ if (n->
return_
flags & KDBUS_NAME_IN_QUEUE)
return 0;
return 1;
return 0;
return 1;
@@
-151,7
+150,7
@@
_public_ int sd_bus_request_name(sd_bus *bus, const char *name, uint64_t flags)
}
static int bus_release_name_kernel(sd_bus *bus, const char *name) {
}
static int bus_release_name_kernel(sd_bus *bus, const char *name) {
- struct kdbus_cmd
_name
*n;
+ struct kdbus_cmd *n;
size_t size, l;
int r;
size_t size, l;
int r;
@@
-159,7
+158,7
@@
static int bus_release_name_kernel(sd_bus *bus, const char *name) {
assert(name);
l = strlen(name) + 1;
assert(name);
l = strlen(name) + 1;
- size = offsetof(struct kdbus_cmd
_name
, items) + KDBUS_ITEM_SIZE(l);
+ size = offsetof(struct kdbus_cmd, items) + KDBUS_ITEM_SIZE(l);
n = alloca0_align(size, 8);
n->size = size;
n = alloca0_align(size, 8);
n->size = size;
@@
-219,7
+218,7
@@
_public_ int sd_bus_release_name(sd_bus *bus, const char *name) {
assert_return(service_name_is_valid(name), -EINVAL);
assert_return(name[0] != ':', -EINVAL);
assert_return(service_name_is_valid(name), -EINVAL);
assert_return(name[0] != ':', -EINVAL);
- /* Don't allow re
quest
ing the special driver and local names */
+ /* Don't allow re
leas
ing the special driver and local names */
if (STR_IN_SET(name, "org.freedesktop.DBus", "org.freedesktop.DBus.Local"))
return -EINVAL;
if (STR_IN_SET(name, "org.freedesktop.DBus", "org.freedesktop.DBus.Local"))
return -EINVAL;
@@
-233,32
+232,31
@@
_public_ int sd_bus_release_name(sd_bus *bus, const char *name) {
}
static int kernel_get_list(sd_bus *bus, uint64_t flags, char ***x) {
}
static int kernel_get_list(sd_bus *bus, uint64_t flags, char ***x) {
- struct kdbus_cmd_name_list cmd = {};
- struct kdbus_name_list *name_list;
- struct kdbus_name_info *name;
+ struct kdbus_cmd_list cmd = {
+ .size = sizeof(cmd),
+ .flags = flags,
+ };
+ struct kdbus_info *name_list, *name;
uint64_t previous_id = 0;
int r;
/* Caller will free half-constructed list on failure... */
uint64_t previous_id = 0;
int r;
/* Caller will free half-constructed list on failure... */
- cmd.size = sizeof(cmd);
- cmd.flags = flags;
-
- r = ioctl(bus->input_fd, KDBUS_CMD_NAME_LIST, &cmd);
+ r = ioctl(bus->input_fd, KDBUS_CMD_LIST, &cmd);
if (r < 0)
return -errno;
if (r < 0)
return -errno;
- name_list = (struct kdbus_
name_list
*) ((uint8_t *) bus->kdbus_buffer + cmd.offset);
+ name_list = (struct kdbus_
info
*) ((uint8_t *) bus->kdbus_buffer + cmd.offset);
- KDBUS_
ITEM_FOREACH(name, name_list, names
) {
+ KDBUS_
FOREACH(name, name_list, cmd.list_size
) {
struct kdbus_item *item;
const char *entry_name = NULL;
struct kdbus_item *item;
const char *entry_name = NULL;
- if ((flags & KDBUS_
NAME_LIST_UNIQUE) && name->owner_
id != previous_id) {
+ if ((flags & KDBUS_
LIST_UNIQUE) && name->
id != previous_id) {
char *n;
char *n;
- if (asprintf(&n, ":1.%llu", (unsigned long long) name->
owner_
id) < 0) {
+ if (asprintf(&n, ":1.%llu", (unsigned long long) name->id) < 0) {
r = -ENOMEM;
goto fail;
}
r = -ENOMEM;
goto fail;
}
@@
-267,7
+265,7
@@
static int kernel_get_list(sd_bus *bus, uint64_t flags, char ***x) {
if (r < 0)
goto fail;
if (r < 0)
goto fail;
- previous_id = name->
owner_
id;
+ previous_id = name->id;
}
KDBUS_ITEM_FOREACH(item, name, items)
}
KDBUS_ITEM_FOREACH(item, name, items)
@@
-295,13
+293,13
@@
static int bus_list_names_kernel(sd_bus *bus, char ***acquired, char ***activata
int r;
if (acquired) {
int r;
if (acquired) {
- r = kernel_get_list(bus, KDBUS_
NAME_LIST_UNIQUE | KDBUS_NAME
_LIST_NAMES, &x);
+ r = kernel_get_list(bus, KDBUS_
LIST_UNIQUE | KDBUS
_LIST_NAMES, &x);
if (r < 0)
return r;
}
if (activatable) {
if (r < 0)
return r;
}
if (activatable) {
- r = kernel_get_list(bus, KDBUS_
NAME_
LIST_ACTIVATORS, &y);
+ r = kernel_get_list(bus, KDBUS_LIST_ACTIVATORS, &y);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-585,16
+583,17
@@
static int bus_populate_creds_from_items(
case KDBUS_ITEM_AUXGROUPS:
if (mask & SD_BUS_CREDS_SUPPLEMENTARY_GIDS) {
case KDBUS_ITEM_AUXGROUPS:
if (mask & SD_BUS_CREDS_SUPPLEMENTARY_GIDS) {
- size_t n;
+ size_t
i,
n;
uid_t *g;
uid_t *g;
- assert_cc(sizeof(gid_t) == sizeof(uint32_t));
-
- n = (item->size - offsetof(struct kdbus_item, data32)) / sizeof(uint32_t);
- g = newdup(gid_t, item->data32, n);
+ n = (item->size - offsetof(struct kdbus_item, data64)) / sizeof(uint64_t);
+ g = new(gid_t, n);
if (!g)
return -ENOMEM;
if (!g)
return -ENOMEM;
+ for (i = 0; i < n; i++)
+ g[i] = item->data64[i];
+
free(c->supplementary_gids);
c->supplementary_gids = g;
c->n_supplementary_gids = n;
free(c->supplementary_gids);
c->supplementary_gids = g;
c->n_supplementary_gids = n;
@@
-641,11
+640,8
@@
int bus_get_name_creds_kdbus(
memcpy(cmd->items[0].str, name, l);
}
memcpy(cmd->items[0].str, name, l);
}
- cmd->size = size;
- cmd->flags = attach_flags_to_kdbus(mask);
-
- /* If augmentation is on, and the bus doesn't didn't allow us
- * to get the bits we want, then ask for the PID/TID so that we
+ /* If augmentation is on, and the bus didn't provide us
+ * the bits we want, then ask for the PID/TID so that we
* can read the rest from /proc. */
if ((mask & SD_BUS_CREDS_AUGMENT) &&
(mask & (SD_BUS_CREDS_UID|SD_BUS_CREDS_EUID|SD_BUS_CREDS_SUID|SD_BUS_CREDS_FSUID|
* can read the rest from /proc. */
if ((mask & SD_BUS_CREDS_AUGMENT) &&
(mask & (SD_BUS_CREDS_UID|SD_BUS_CREDS_EUID|SD_BUS_CREDS_SUID|SD_BUS_CREDS_FSUID|
@@
-655,7
+651,10
@@
int bus_get_name_creds_kdbus(
SD_BUS_CREDS_EFFECTIVE_CAPS|SD_BUS_CREDS_PERMITTED_CAPS|SD_BUS_CREDS_INHERITABLE_CAPS|SD_BUS_CREDS_BOUNDING_CAPS|
SD_BUS_CREDS_SELINUX_CONTEXT|
SD_BUS_CREDS_AUDIT_SESSION_ID|SD_BUS_CREDS_AUDIT_LOGIN_UID)))
SD_BUS_CREDS_EFFECTIVE_CAPS|SD_BUS_CREDS_PERMITTED_CAPS|SD_BUS_CREDS_INHERITABLE_CAPS|SD_BUS_CREDS_BOUNDING_CAPS|
SD_BUS_CREDS_SELINUX_CONTEXT|
SD_BUS_CREDS_AUDIT_SESSION_ID|SD_BUS_CREDS_AUDIT_LOGIN_UID)))
- cmd->flags |= KDBUS_ATTACH_PIDS;
+ mask |= SD_BUS_CREDS_PID;
+
+ cmd->size = size;
+ cmd->attach_flags = attach_flags_to_kdbus(mask);
r = ioctl(bus->input_fd, KDBUS_CMD_CONN_INFO, cmd);
if (r < 0)
r = ioctl(bus->input_fd, KDBUS_CMD_CONN_INFO, cmd);
if (r < 0)
@@
-762,7
+761,7
@@
static int bus_get_name_creds_dbus1(
if ((mask & SD_BUS_CREDS_PID) ||
((mask & SD_BUS_CREDS_AUGMENT) &&
if ((mask & SD_BUS_CREDS_PID) ||
((mask & SD_BUS_CREDS_AUGMENT) &&
- (mask & (SD_BUS_CREDS_
E
UID|SD_BUS_CREDS_SUID|SD_BUS_CREDS_FSUID|
+ (mask & (SD_BUS_CREDS_UID|SD_BUS_CREDS_SUID|SD_BUS_CREDS_FSUID|
SD_BUS_CREDS_GID|SD_BUS_CREDS_EGID|SD_BUS_CREDS_SGID|SD_BUS_CREDS_FSGID|
SD_BUS_CREDS_COMM|SD_BUS_CREDS_EXE|SD_BUS_CREDS_CMDLINE|
SD_BUS_CREDS_CGROUP|SD_BUS_CREDS_UNIT|SD_BUS_CREDS_USER_UNIT|SD_BUS_CREDS_SLICE|SD_BUS_CREDS_SESSION|SD_BUS_CREDS_OWNER_UID|
SD_BUS_CREDS_GID|SD_BUS_CREDS_EGID|SD_BUS_CREDS_SGID|SD_BUS_CREDS_FSGID|
SD_BUS_CREDS_COMM|SD_BUS_CREDS_EXE|SD_BUS_CREDS_CMDLINE|
SD_BUS_CREDS_CGROUP|SD_BUS_CREDS_UNIT|SD_BUS_CREDS_USER_UNIT|SD_BUS_CREDS_SLICE|SD_BUS_CREDS_SESSION|SD_BUS_CREDS_OWNER_UID|
@@
-798,7
+797,7
@@
static int bus_get_name_creds_dbus1(
reply = sd_bus_message_unref(reply);
}
reply = sd_bus_message_unref(reply);
}
- if (mask & SD_BUS_CREDS_UID) {
+ if (mask & SD_BUS_CREDS_
E
UID) {
uint32_t u;
r = sd_bus_call_method(
uint32_t u;
r = sd_bus_call_method(
@@
-818,8
+817,8
@@
static int bus_get_name_creds_dbus1(
if (r < 0)
return r;
if (r < 0)
return r;
- c->uid = u;
- c->mask |= SD_BUS_CREDS_UID;
+ c->
e
uid = u;
+ c->mask |= SD_BUS_CREDS_
E
UID;
reply = sd_bus_message_unref(reply);
}
reply = sd_bus_message_unref(reply);
}
@@
-897,7
+896,7
@@
_public_ int sd_bus_get_name_creds(
static int bus_get_owner_creds_kdbus(sd_bus *bus, uint64_t mask, sd_bus_creds **ret) {
_cleanup_bus_creds_unref_ sd_bus_creds *c = NULL;
struct kdbus_cmd_info cmd = {
static int bus_get_owner_creds_kdbus(sd_bus *bus, uint64_t mask, sd_bus_creds **ret) {
_cleanup_bus_creds_unref_ sd_bus_creds *c = NULL;
struct kdbus_cmd_info cmd = {
- .size = sizeof(struct kdbus_cmd_info)
+ .size = sizeof(struct kdbus_cmd_info)
,
};
struct kdbus_info *creator_info;
pid_t pid = 0;
};
struct kdbus_info *creator_info;
pid_t pid = 0;
@@
-907,8
+906,6
@@
static int bus_get_owner_creds_kdbus(sd_bus *bus, uint64_t mask, sd_bus_creds **
if (!c)
return -ENOMEM;
if (!c)
return -ENOMEM;
- cmd.flags = attach_flags_to_kdbus(mask);
-
/* If augmentation is on, and the bus doesn't didn't allow us
* to get the bits we want, then ask for the PID/TID so that we
* can read the rest from /proc. */
/* If augmentation is on, and the bus doesn't didn't allow us
* to get the bits we want, then ask for the PID/TID so that we
* can read the rest from /proc. */
@@
-920,7
+917,9
@@
static int bus_get_owner_creds_kdbus(sd_bus *bus, uint64_t mask, sd_bus_creds **
SD_BUS_CREDS_EFFECTIVE_CAPS|SD_BUS_CREDS_PERMITTED_CAPS|SD_BUS_CREDS_INHERITABLE_CAPS|SD_BUS_CREDS_BOUNDING_CAPS|
SD_BUS_CREDS_SELINUX_CONTEXT|
SD_BUS_CREDS_AUDIT_SESSION_ID|SD_BUS_CREDS_AUDIT_LOGIN_UID)))
SD_BUS_CREDS_EFFECTIVE_CAPS|SD_BUS_CREDS_PERMITTED_CAPS|SD_BUS_CREDS_INHERITABLE_CAPS|SD_BUS_CREDS_BOUNDING_CAPS|
SD_BUS_CREDS_SELINUX_CONTEXT|
SD_BUS_CREDS_AUDIT_SESSION_ID|SD_BUS_CREDS_AUDIT_LOGIN_UID)))
- cmd.flags |= KDBUS_ATTACH_PIDS;
+ mask |= SD_BUS_CREDS_PID;
+
+ cmd.attach_flags = attach_flags_to_kdbus(mask);
r = ioctl(bus->input_fd, KDBUS_CMD_BUS_CREATOR_INFO, &cmd);
if (r < 0)
r = ioctl(bus->input_fd, KDBUS_CMD_BUS_CREATOR_INFO, &cmd);
if (r < 0)
@@
-961,13
+960,13
@@
static int bus_get_owner_creds_dbus1(sd_bus *bus, uint64_t mask, sd_bus_creds **
}
if (bus->ucred.uid != UID_INVALID) {
}
if (bus->ucred.uid != UID_INVALID) {
- c->uid = bus->ucred.uid;
- c->mask |= SD_BUS_CREDS_UID & mask;
+ c->
e
uid = bus->ucred.uid;
+ c->mask |= SD_BUS_CREDS_
E
UID & mask;
}
if (bus->ucred.gid != GID_INVALID) {
}
if (bus->ucred.gid != GID_INVALID) {
- c->gid = bus->ucred.gid;
- c->mask |= SD_BUS_CREDS_GID & mask;
+ c->
e
gid = bus->ucred.gid;
+ c->mask |= SD_BUS_CREDS_
E
GID & mask;
}
}
}
}
@@
-1268,7
+1267,7
@@
int bus_add_match_internal_kernel(
if (c->type - BUS_MATCH_ARG < 3)
name_change_arg[c->type - BUS_MATCH_ARG] = c->value_str;
if (c->type - BUS_MATCH_ARG < 3)
name_change_arg[c->type - BUS_MATCH_ARG] = c->value_str;
-
snprintf(buf, sizeof(buf), "arg%u
", c->type - BUS_MATCH_ARG);
+
xsprintf(buf, "arg%i
", c->type - BUS_MATCH_ARG);
bloom_add_pair(bloom, bus->bloom_size, bus->bloom_n_hash, buf, c->value_str);
using_bloom = true;
break;
bloom_add_pair(bloom, bus->bloom_size, bus->bloom_n_hash, buf, c->value_str);
using_bloom = true;
break;
@@
-1277,7
+1276,7
@@
int bus_add_match_internal_kernel(
case BUS_MATCH_ARG_PATH...BUS_MATCH_ARG_PATH_LAST: {
char buf[sizeof("arg")-1 + 2 + sizeof("-slash-prefix")];
case BUS_MATCH_ARG_PATH...BUS_MATCH_ARG_PATH_LAST: {
char buf[sizeof("arg")-1 + 2 + sizeof("-slash-prefix")];
-
snprintf(buf, sizeof(buf), "arg%u
-slash-prefix", c->type - BUS_MATCH_ARG_PATH);
+
xsprintf(buf, "arg%i
-slash-prefix", c->type - BUS_MATCH_ARG_PATH);
bloom_add_pair(bloom, bus->bloom_size, bus->bloom_n_hash, buf, c->value_str);
using_bloom = true;
break;
bloom_add_pair(bloom, bus->bloom_size, bus->bloom_n_hash, buf, c->value_str);
using_bloom = true;
break;
@@
-1286,7
+1285,7
@@
int bus_add_match_internal_kernel(
case BUS_MATCH_ARG_NAMESPACE...BUS_MATCH_ARG_NAMESPACE_LAST: {
char buf[sizeof("arg")-1 + 2 + sizeof("-dot-prefix")];
case BUS_MATCH_ARG_NAMESPACE...BUS_MATCH_ARG_NAMESPACE_LAST: {
char buf[sizeof("arg")-1 + 2 + sizeof("-dot-prefix")];
-
snprintf(buf, sizeof(buf), "arg%u
-dot-prefix", c->type - BUS_MATCH_ARG_NAMESPACE);
+
xsprintf(buf, "arg%i
-dot-prefix", c->type - BUS_MATCH_ARG_NAMESPACE);
bloom_add_pair(bloom, bus->bloom_size, bus->bloom_n_hash, buf, c->value_str);
using_bloom = true;
break;
bloom_add_pair(bloom, bus->bloom_size, bus->bloom_n_hash, buf, c->value_str);
using_bloom = true;
break;
@@
-1359,7
+1358,7
@@
int bus_add_match_internal_kernel(
#define internal_match(bus, m) \
((bus)->hello_flags & KDBUS_HELLO_MONITOR \
#define internal_match(bus, m) \
((bus)->hello_flags & KDBUS_HELLO_MONITOR \
- ? (isempty(m) ? "eavesdrop='true'" : str
append
a((m), ",eavesdrop='true'")) \
+ ? (isempty(m) ? "eavesdrop='true'" : str
join
a((m), ",eavesdrop='true'")) \
: (m))
static int bus_add_match_internal_dbus1(
: (m))
static int bus_add_match_internal_dbus1(
@@
-1404,7
+1403,10
@@
int bus_remove_match_internal_kernel(
sd_bus *bus,
uint64_t cookie) {
sd_bus *bus,
uint64_t cookie) {
- struct kdbus_cmd_match m;
+ struct kdbus_cmd_match m = {
+ .size = offsetof(struct kdbus_cmd_match, items),
+ .cookie = cookie,
+ };
int r;
assert(bus);
int r;
assert(bus);
@@
-1413,10
+1415,6
@@
int bus_remove_match_internal_kernel(
if (bus->hello_flags & KDBUS_HELLO_MONITOR)
return 0;
if (bus->hello_flags & KDBUS_HELLO_MONITOR)
return 0;
- zero(m);
- m.size = offsetof(struct kdbus_cmd_match, items);
- m.cookie = cookie;
-
r = ioctl(bus->input_fd, KDBUS_CMD_MATCH_REMOVE, &m);
if (r < 0)
return -errno;
r = ioctl(bus->input_fd, KDBUS_CMD_MATCH_REMOVE, &m);
if (r < 0)
return -errno;