shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-07 21:18:41 +03:00
Code

Merge pull request #33925 from YHNdnzj/exec-serialize-path-escape

Browse Source 
core/execute-serialize: two fixes
This commit is contained in:
Yu Watanabe 2024-08-04 09:35:51 +09:00 committed by GitHub
commit cec96f12ff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/core/execute-serialize.c
View File

@ -434,11 +434,11 @@ static int exec_cgroup_context_serialize(const CGroupContext *c, FILE *f) {
if (r < 0)
return r;
r = serialize_strv(f, "exec-cgroup-context-ip-ingress-filter-path=", c->ip_filters_ingress);
r = serialize_strv(f, "exec-cgroup-context-ip-ingress-filter-path", c->ip_filters_ingress);
if (r < 0)
return r;
r = serialize_strv(f, "exec-cgroup-context-ip-egress-filter-path=", c->ip_filters_egress);
r = serialize_strv(f, "exec-cgroup-context-ip-egress-filter-path", c->ip_filters_egress);
if (r < 0)
return r;
@ -1759,15 +1759,23 @@ static int exec_context_serialize(const ExecContext *c, FILE *f) {
if (r < 0)
return r;
r = serialize_item(f, "exec-context-working-directory", c->working_directory);
r = serialize_item_escaped(f, "exec-context-working-directory", c->working_directory);
if (r < 0)
return r;
r = serialize_item(f, "exec-context-root-directory", c->root_directory);
r = serialize_bool_elide(f, "exec-context-working-directory-missing-ok", c->working_directory_missing_ok);
if (r < 0)
return r;
r = serialize_item(f, "exec-context-root-image", c->root_image);
r = serialize_bool_elide(f, "exec-context-working-directory-home", c->working_directory_home);
if (r < 0)
return r;
r = serialize_item_escaped(f, "exec-context-root-directory", c->root_directory);
if (r < 0)
return r;
r = serialize_item_escaped(f, "exec-context-root-image", c->root_image);
if (r < 0)
return r;
@ -1982,14 +1990,6 @@ static int exec_context_serialize(const ExecContext *c, FILE *f) {
return r;
}
r = serialize_bool_elide(f, "exec-context-working-directory-missing-ok", c->working_directory_missing_ok);
if (r < 0)
return r;
r = serialize_bool_elide(f, "exec-context-working-directory-home", c->working_directory_home);
if (r < 0)
return r;
if (c->oom_score_adjust_set) {
r = serialize_item_format(f, "exec-context-oom-score-adjust", "%i", c->oom_score_adjust);
if (r < 0)
@ -2616,17 +2616,29 @@ static int exec_context_deserialize(ExecContext *c, FILE *f) {
if (r < 0)
return r;
} else if ((val = startswith(l, "exec-context-working-directory="))) {
r = free_and_strdup(&c->working_directory, val);
if (r < 0)
return r;
ssize_t k;
char *p;
k = cunescape(val, 0, &p);
if (k < 0)
return k;
free_and_replace(c->working_directory, p);
} else if ((val = startswith(l, "exec-context-root-directory="))) {
r = free_and_strdup(&c->root_directory, val);
if (r < 0)
return r;
ssize_t k;
char *p;
k = cunescape(val, 0, &p);
if (k < 0)
return k;
free_and_replace(c->root_directory, p);
} else if ((val = startswith(l, "exec-context-root-image="))) {
r = free_and_strdup(&c->root_image, val);
if (r < 0)
return r;
ssize_t k;
char *p;
k = cunescape(val, 0, &p);
if (k < 0)
return k;
free_and_replace(c->root_image, p);
} else if ((val = startswith(l, "exec-context-root-image-options="))) {
for (;;) {
_cleanup_free_ char *word = NULL, *mount_options = NULL, *partition = NULL;