|
 |
35bb946 |
From 5038dc90efcd92e3fbbae06a7d459c8f5d549915 Mon Sep 17 00:00:00 2001
|
|
|
35bb946 |
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
|
|
35bb946 |
Date: Thu, 19 Oct 2017 22:40:04 +0900
|
|
|
35bb946 |
Subject: [PATCH] core: fix D-Bus API
|
|
|
35bb946 |
|
|
|
35bb946 |
This fixes bugs introduced by cffaed83e87bde81378b2be74192193850d0e03a.
|
|
|
35bb946 |
|
|
|
35bb946 |
Closes #7129.
|
|
|
35bb946 |
|
|
|
35bb946 |
(cherry picked from commit 3f856a2813359ad8203ccad388e54ff41a9ecaf1)
|
|
|
35bb946 |
---
|
|
|
35bb946 |
src/core/dbus-execute.c | 8 ++---
|
|
|
35bb946 |
src/shared/bus-unit-util.c | 79 ++++++++++++++++++++++++++--------------------
|
|
|
35bb946 |
2 files changed, 49 insertions(+), 38 deletions(-)
|
|
|
35bb946 |
|
|
|
35bb946 |
diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c
|
|
|
35bb946 |
index e0aa9fdd82..26c6e039b8 100644
|
|
|
35bb946 |
--- a/src/core/dbus-execute.c
|
|
|
35bb946 |
+++ b/src/core/dbus-execute.c
|
|
|
35bb946 |
@@ -1189,7 +1189,7 @@ int bus_exec_context_set_transient_property(
|
|
|
35bb946 |
|
|
|
35bb946 |
} else if (streq(name, "SystemCallFilter")) {
|
|
|
35bb946 |
int whitelist;
|
|
|
35bb946 |
- _cleanup_strv_free_ char **l;
|
|
|
35bb946 |
+ _cleanup_strv_free_ char **l = NULL;
|
|
|
35bb946 |
|
|
|
35bb946 |
r = sd_bus_message_enter_container(message, 'r', "bas");
|
|
|
35bb946 |
if (r < 0)
|
|
|
35bb946 |
@@ -1238,7 +1238,7 @@ int bus_exec_context_set_transient_property(
|
|
|
35bb946 |
if (id == __NR_SCMP_ERROR)
|
|
|
35bb946 |
return -EINVAL;
|
|
|
35bb946 |
|
|
|
35bb946 |
- r = set_put(c->address_families, INT_TO_PTR(id + 1));
|
|
|
35bb946 |
+ r = set_put(c->syscall_filter, INT_TO_PTR(id + 1));
|
|
|
35bb946 |
if (r < 0)
|
|
|
35bb946 |
return r;
|
|
|
35bb946 |
}
|
|
|
35bb946 |
@@ -1250,7 +1250,7 @@ int bus_exec_context_set_transient_property(
|
|
|
35bb946 |
if (id == __NR_SCMP_ERROR)
|
|
|
35bb946 |
return -EINVAL;
|
|
|
35bb946 |
|
|
|
35bb946 |
- r = set_put(c->address_families, INT_TO_PTR(id + 1));
|
|
|
35bb946 |
+ r = set_put(c->syscall_filter, INT_TO_PTR(id + 1));
|
|
|
35bb946 |
if (r < 0)
|
|
|
35bb946 |
return r;
|
|
|
35bb946 |
}
|
|
|
35bb946 |
@@ -1330,7 +1330,7 @@ int bus_exec_context_set_transient_property(
|
|
|
35bb946 |
|
|
|
35bb946 |
} else if (streq(name, "RestrictAddressFamilies")) {
|
|
|
35bb946 |
int whitelist;
|
|
|
35bb946 |
- _cleanup_strv_free_ char **l;
|
|
|
35bb946 |
+ _cleanup_strv_free_ char **l = NULL;
|
|
|
35bb946 |
|
|
|
35bb946 |
r = sd_bus_message_enter_container(message, 'r', "bas");
|
|
|
35bb946 |
if (r < 0)
|
|
|
35bb946 |
diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c
|
|
|
35bb946 |
index 6e2022587a..0b8260193a 100644
|
|
|
35bb946 |
--- a/src/shared/bus-unit-util.c
|
|
|
35bb946 |
+++ b/src/shared/bus-unit-util.c
|
|
|
35bb946 |
@@ -602,12 +602,9 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen
|
|
|
35bb946 |
|
|
|
35bb946 |
} else if (streq(field, "SystemCallFilter")) {
|
|
|
35bb946 |
int whitelist;
|
|
|
35bb946 |
+ _cleanup_strv_free_ char **l = NULL;
|
|
|
35bb946 |
const char *p;
|
|
|
35bb946 |
|
|
|
35bb946 |
- r = sd_bus_message_open_container(m, 'v', "bas");
|
|
|
35bb946 |
- if (r < 0)
|
|
|
35bb946 |
- return bus_log_create_error(r);
|
|
|
35bb946 |
-
|
|
|
35bb946 |
p = eq;
|
|
|
35bb946 |
if (*p == '~') {
|
|
|
35bb946 |
whitelist = 0;
|
|
|
35bb946 |
@@ -615,18 +612,10 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen
|
|
|
35bb946 |
} else
|
|
|
35bb946 |
whitelist = 1;
|
|
|
35bb946 |
|
|
|
35bb946 |
- r = sd_bus_message_append_basic(m, 'b', &whitelist);
|
|
|
35bb946 |
- if (r < 0)
|
|
|
35bb946 |
- return bus_log_create_error(r);
|
|
|
35bb946 |
-
|
|
|
35bb946 |
- r = sd_bus_message_open_container(m, 'a', "s");
|
|
|
35bb946 |
- if (r < 0)
|
|
|
35bb946 |
- return bus_log_create_error(r);
|
|
|
35bb946 |
-
|
|
|
35bb946 |
if (whitelist != 0) {
|
|
|
35bb946 |
- r = sd_bus_message_append_basic(m, 's', "@default");
|
|
|
35bb946 |
+ r = strv_extend(&l, "@default");
|
|
|
35bb946 |
if (r < 0)
|
|
|
35bb946 |
- return bus_log_create_error(r);
|
|
|
35bb946 |
+ return log_oom();
|
|
|
35bb946 |
}
|
|
|
35bb946 |
|
|
|
35bb946 |
for (;;) {
|
|
|
35bb946 |
@@ -638,16 +627,34 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen
|
|
|
35bb946 |
if (r == 0)
|
|
|
35bb946 |
break;
|
|
|
35bb946 |
|
|
|
35bb946 |
- r = sd_bus_message_append_basic(m, 's', word);
|
|
|
35bb946 |
+ r = strv_extend(&l, word);
|
|
|
35bb946 |
if (r < 0)
|
|
|
35bb946 |
- return bus_log_create_error(r);
|
|
|
35bb946 |
+ return log_oom();
|
|
|
35bb946 |
}
|
|
|
35bb946 |
|
|
|
35bb946 |
+ r = sd_bus_message_open_container(m, 'v', "(bas)");
|
|
|
35bb946 |
+ if (r < 0)
|
|
|
35bb946 |
+ return bus_log_create_error(r);
|
|
|
35bb946 |
+
|
|
|
35bb946 |
+ r = sd_bus_message_open_container(m, 'r', "bas");
|
|
|
35bb946 |
+ if (r < 0)
|
|
|
35bb946 |
+ return bus_log_create_error(r);
|
|
|
35bb946 |
+
|
|
|
35bb946 |
+ r = sd_bus_message_append_basic(m, 'b', &whitelist);
|
|
|
35bb946 |
+ if (r < 0)
|
|
|
35bb946 |
+ return bus_log_create_error(r);
|
|
|
35bb946 |
+
|
|
|
35bb946 |
+ r = sd_bus_message_append_strv(m, l);
|
|
|
35bb946 |
+ if (r < 0)
|
|
|
35bb946 |
+ return bus_log_create_error(r);
|
|
|
35bb946 |
+
|
|
|
35bb946 |
r = sd_bus_message_close_container(m);
|
|
|
35bb946 |
if (r < 0)
|
|
|
35bb946 |
return bus_log_create_error(r);
|
|
|
35bb946 |
|
|
|
35bb946 |
r = sd_bus_message_close_container(m);
|
|
|
35bb946 |
+ if (r < 0)
|
|
|
35bb946 |
+ return bus_log_create_error(r);
|
|
|
35bb946 |
|
|
|
35bb946 |
} else if (streq(field, "SystemCallArchitectures")) {
|
|
|
35bb946 |
const char *p;
|
|
|
35bb946 |
@@ -691,27 +698,15 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen
|
|
|
35bb946 |
|
|
|
35bb946 |
} else if (streq(field, "RestrictAddressFamilies")) {
|
|
|
35bb946 |
int whitelist;
|
|
|
35bb946 |
- const char *p;
|
|
|
35bb946 |
+ _cleanup_strv_free_ char **l = NULL;
|
|
|
35bb946 |
+ const char *p = eq;
|
|
|
35bb946 |
|
|
|
35bb946 |
- r = sd_bus_message_open_container(m, 'v', "bas");
|
|
|
35bb946 |
- if (r < 0)
|
|
|
35bb946 |
- return bus_log_create_error(r);
|
|
|
35bb946 |
-
|
|
|
35bb946 |
- p = eq;
|
|
|
35bb946 |
if (*p == '~') {
|
|
|
35bb946 |
whitelist = 0;
|
|
|
35bb946 |
p++;
|
|
|
35bb946 |
} else
|
|
|
35bb946 |
whitelist = 1;
|
|
|
35bb946 |
|
|
|
35bb946 |
- r = sd_bus_message_append_basic(m, 'b', &whitelist);
|
|
|
35bb946 |
- if (r < 0)
|
|
|
35bb946 |
- return bus_log_create_error(r);
|
|
|
35bb946 |
-
|
|
|
35bb946 |
- r = sd_bus_message_open_container(m, 'a', "s");
|
|
|
35bb946 |
- if (r < 0)
|
|
|
35bb946 |
- return bus_log_create_error(r);
|
|
|
35bb946 |
-
|
|
|
35bb946 |
for (;;) {
|
|
|
35bb946 |
_cleanup_free_ char *word = NULL;
|
|
|
35bb946 |
|
|
|
35bb946 |
@@ -721,19 +716,35 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen
|
|
|
35bb946 |
if (r == 0)
|
|
|
35bb946 |
break;
|
|
|
35bb946 |
|
|
|
35bb946 |
- r = sd_bus_message_append_basic(m, 's', word);
|
|
|
35bb946 |
+ r = strv_extend(&l, word);
|
|
|
35bb946 |
if (r < 0)
|
|
|
35bb946 |
- return bus_log_create_error(r);
|
|
|
35bb946 |
+ return log_oom();
|
|
|
35bb946 |
}
|
|
|
35bb946 |
|
|
|
35bb946 |
- r = sd_bus_message_close_container(m);
|
|
|
35bb946 |
+ r = sd_bus_message_open_container(m, 'v', "(bas)");
|
|
|
35bb946 |
+ if (r < 0)
|
|
|
35bb946 |
+ return bus_log_create_error(r);
|
|
|
35bb946 |
+
|
|
|
35bb946 |
+ r = sd_bus_message_open_container(m, 'r', "bas");
|
|
|
35bb946 |
+ if (r < 0)
|
|
|
35bb946 |
+ return bus_log_create_error(r);
|
|
|
35bb946 |
+
|
|
|
35bb946 |
+ r = sd_bus_message_append_basic(m, 'b', &whitelist);
|
|
|
35bb946 |
+ if (r < 0)
|
|
|
35bb946 |
+ return bus_log_create_error(r);
|
|
|
35bb946 |
+
|
|
|
35bb946 |
+ r = sd_bus_message_append_strv(m, l);
|
|
|
35bb946 |
if (r < 0)
|
|
|
35bb946 |
return bus_log_create_error(r);
|
|
|
35bb946 |
|
|
|
35bb946 |
r = sd_bus_message_close_container(m);
|
|
|
35bb946 |
+ if (r < 0)
|
|
|
35bb946 |
+ return bus_log_create_error(r);
|
|
|
35bb946 |
|
|
|
35bb946 |
+ r = sd_bus_message_close_container(m);
|
|
|
35bb946 |
+ if (r < 0)
|
|
|
35bb946 |
+ return bus_log_create_error(r);
|
|
|
35bb946 |
#endif
|
|
|
35bb946 |
-
|
|
|
35bb946 |
} else if (streq(field, "FileDescriptorStoreMax")) {
|
|
|
35bb946 |
unsigned u;
|
|
|
35bb946 |
|