system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-09-30 05:15:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #33334 from poettering/machined-more-pidfd

Browse source 
machined: prefer pinning clients via pidfd when creating machine, rat…
This commit is contained in:
Luca Boccassi 2024-06-15 00:13:50 +01:00 committed by GitHub
parent 67153a7bc4 0870654241
commit 10880ae3c4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/machine/machined-dbus.c
View file

@ -218,7 +218,13 @@ static int method_list_machines(sd_bus_message *message, void *userdata, sd_bus_
return sd_bus_send(NULL, reply, NULL);
}
static int method_create_or_register_machine(Manager *manager, sd_bus_message *message, bool read_network, Machine **_m, sd_bus_error *error) {
static int method_create_or_register_machine(
Manager *manager,
sd_bus_message *message,
bool read_network,
Machine **ret,
sd_bus_error *error) {
_cleanup_(pidref_done) PidRef pidref = PIDREF_NULL;
const char *name, *service, *class, *root_directory;
const int32_t *netif = NULL;
@ -232,7 +238,7 @@ static int method_create_or_register_machine(Manager *manager, sd_bus_message *m
assert(manager);
assert(message);
assert(_m);
assert(ret);
r = sd_bus_message_read(message, "s", &name);
if (r < 0)
@ -282,23 +288,15 @@ static int method_create_or_register_machine(Manager *manager, sd_bus_message *m
return sd_bus_error_set(error, SD_BUS_ERROR_INVALID_ARGS, "Root directory must be empty or an absolute path");
if (leader == 0) {
_cleanup_(sd_bus_creds_unrefp) sd_bus_creds *creds = NULL;
r = sd_bus_query_sender_creds(message, SD_BUS_CREDS_PID, &creds);
r = bus_query_sender_pidref(message, &pidref);
if (r < 0)
return r;
assert_cc(sizeof(uint32_t) == sizeof(pid_t));
r = sd_bus_creds_get_pid(creds, (pid_t*) &leader);
return sd_bus_error_set_errnof(error, r, "Failed to pin client process: %m");
} else {
r = pidref_set_pid(&pidref, leader);
if (r < 0)
return r;
return sd_bus_error_set_errnof(error, r, "Failed to pin process " PID_FMT ": %m", (pid_t) leader);
}
r = pidref_set_pid(&pidref, leader);
if (r < 0)
return sd_bus_error_set_errnof(error, r, "Failed to pin process " PID_FMT ": %m", pidref.pid);
if (hashmap_get(manager->machines, name))
return sd_bus_error_setf(error, BUS_ERROR_MACHINE_EXISTS, "Machine '%s' already exists", name);
@ -337,8 +335,7 @@ static int method_create_or_register_machine(Manager *manager, sd_bus_message *m
m->n_netif = n_netif;
}
*_m = m;
*ret = m;
return 1;
fail:
@ -393,7 +390,7 @@ static int method_register_machine_internal(sd_bus_message *message, bool read_n
if (r < 0)
return r;
r = cg_pid_get_unit(m->leader.pid, &m->unit);
r = cg_pidref_get_unit(&m->leader, &m->unit);
if (r < 0) {
r = sd_bus_error_set_errnof(error, r,
"Failed to determine unit of process "PID_FMT" : %m",