morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 16:37:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7141 from yuwata/fix-7129

Browse Source 
core: fix D-Bus API
This commit is contained in:
Lennart Poettering
2017-10-24 15:25:12 +02:00
committed by GitHub
parent 0c2826c60c 3f856a2813
commit ceeb433c39
2 changed files with 49 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/dbus-execute.c
View File

@@ -1189,7 +1189,7 @@ int bus_exec_context_set_transient_property(
} else if (streq(name, "SystemCallFilter")) {
int whitelist;
_cleanup_strv_free_ char **l;
_cleanup_strv_free_ char **l = NULL;
r = sd_bus_message_enter_container(message, 'r', "bas");
if (r < 0)
@@ -1238,7 +1238,7 @@ int bus_exec_context_set_transient_property(
if (id == __NR_SCMP_ERROR)
return -EINVAL;
r = set_put(c->address_families, INT_TO_PTR(id + 1));
r = set_put(c->syscall_filter, INT_TO_PTR(id + 1));
if (r < 0)
return r;
}
@@ -1250,7 +1250,7 @@ int bus_exec_context_set_transient_property(
if (id == __NR_SCMP_ERROR)
return -EINVAL;
r = set_put(c->address_families, INT_TO_PTR(id + 1));
r = set_put(c->syscall_filter, INT_TO_PTR(id + 1));
if (r < 0)
return r;
}
@@ -1330,7 +1330,7 @@ int bus_exec_context_set_transient_property(
} else if (streq(name, "RestrictAddressFamilies")) {
int whitelist;
_cleanup_strv_free_ char **l;
_cleanup_strv_free_ char **l = NULL;
r = sd_bus_message_enter_container(message, 'r', "bas");
if (r < 0)

79
src/shared/bus-unit-util.c
View File

@@ -602,12 +602,9 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen
} else if (streq(field, "SystemCallFilter")) {
int whitelist;
_cleanup_strv_free_ char **l = NULL;
const char *p;
r = sd_bus_message_open_container(m, 'v', "bas");
if (r < 0)
return bus_log_create_error(r);
p = eq;
if (*p == '~') {
whitelist = 0;
@@ -615,18 +612,10 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen
} else
whitelist = 1;
r = sd_bus_message_append_basic(m, 'b', &whitelist);
if (r < 0)
return bus_log_create_error(r);
r = sd_bus_message_open_container(m, 'a', "s");
if (r < 0)
return bus_log_create_error(r);
if (whitelist != 0) {
r = sd_bus_message_append_basic(m, 's', "@default");
r = strv_extend(&l, "@default");
if (r < 0)
return bus_log_create_error(r);
return log_oom();
}
for (;;) {
@@ -638,16 +627,34 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen
if (r == 0)
break;
r = sd_bus_message_append_basic(m, 's', word);
r = strv_extend(&l, word);
if (r < 0)
return bus_log_create_error(r);
return log_oom();
}
r = sd_bus_message_open_container(m, 'v', "(bas)");
if (r < 0)
return bus_log_create_error(r);
r = sd_bus_message_open_container(m, 'r', "bas");
if (r < 0)
return bus_log_create_error(r);
r = sd_bus_message_append_basic(m, 'b', &whitelist);
if (r < 0)
return bus_log_create_error(r);
r = sd_bus_message_append_strv(m, l);
if (r < 0)
return bus_log_create_error(r);
r = sd_bus_message_close_container(m);
if (r < 0)
return bus_log_create_error(r);
r = sd_bus_message_close_container(m);
if (r < 0)
return bus_log_create_error(r);
} else if (streq(field, "SystemCallArchitectures")) {
const char *p;
@@ -691,27 +698,15 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen
} else if (streq(field, "RestrictAddressFamilies")) {
int whitelist;
const char *p;
_cleanup_strv_free_ char **l = NULL;
const char *p = eq;
r = sd_bus_message_open_container(m, 'v', "bas");
if (r < 0)
return bus_log_create_error(r);
p = eq;
if (*p == '~') {
whitelist = 0;
p++;
} else
whitelist = 1;
r = sd_bus_message_append_basic(m, 'b', &whitelist);
if (r < 0)
return bus_log_create_error(r);
r = sd_bus_message_open_container(m, 'a', "s");
if (r < 0)
return bus_log_create_error(r);
for (;;) {
_cleanup_free_ char *word = NULL;
@@ -721,19 +716,35 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen
if (r == 0)
break;
r = sd_bus_message_append_basic(m, 's', word);
r = strv_extend(&l, word);
if (r < 0)
return bus_log_create_error(r);
return log_oom();
}
r = sd_bus_message_open_container(m, 'v', "(bas)");
if (r < 0)
return bus_log_create_error(r);
r = sd_bus_message_open_container(m, 'r', "bas");
if (r < 0)
return bus_log_create_error(r);
r = sd_bus_message_append_basic(m, 'b', &whitelist);
if (r < 0)
return bus_log_create_error(r);
r = sd_bus_message_append_strv(m, l);
if (r < 0)
return bus_log_create_error(r);
r = sd_bus_message_close_container(m);
if (r < 0)
return bus_log_create_error(r);
r = sd_bus_message_close_container(m);
if (r < 0)
return bus_log_create_error(r);
#endif
} else if (streq(field, "FileDescriptorStoreMax")) {
unsigned u;