SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core/dbus-execute: fix memleak on Mount/ExtensionImages parse failure

Browse Source 
Define mount_image_free_many() in our usual fashion for use in
CLEANUP_ARRAY and ensure proper cleanup on error paths.
This commit is contained in:
Mike Yuan
2026-01-19 23:22:32 +01:00
parent 331fef07d8
commit 00f459f30f
5 changed files with 56 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/dbus-execute.c
+29 -16
View File
@@ -4050,6 +4050,8 @@ int bus_exec_context_set_transient_property(
char *source, *destination;
int permissive;
CLEANUP_ARRAY(mount_images, n_mount_images, mount_image_free_many);
r = sd_bus_message_enter_container(message, 'a', "(ssba(ss))");
if (r < 0)
return r;
@@ -4122,15 +4124,21 @@ int bus_exec_context_set_transient_property(
if (!UNIT_WRITE_FLAGS_NOOP(flags)) {
if (n_mount_images == 0) {
c->mount_images = mount_image_free_many(c->mount_images, &c->n_mount_images);
mount_image_free_many(c->mount_images, c->n_mount_images);
c->mount_images = NULL;
c->n_mount_images = 0;
unit_write_settingf(u, flags, name, "%s=", name);
} else {
for (size_t i = 0; i < n_mount_images; ++i) {
r = mount_image_add(&c->mount_images, &c->n_mount_images, &mount_images[i]);
if (r < 0)
return r;
}
if (!c->mount_images) {
c->mount_images = TAKE_PTR(mount_images);
c->n_mount_images = n_mount_images;
} else
FOREACH_ARRAY(i, mount_images, n_mount_images) {
r = mount_image_add(&c->mount_images, &c->n_mount_images, i);
if (r < 0)
return r;
}
unit_write_settingf(u, flags|UNIT_ESCAPE_C|UNIT_ESCAPE_SPECIFIERS,
name,
@@ -4140,14 +4148,15 @@ int bus_exec_context_set_transient_property(
}
}
mount_images = mount_image_free_many(mount_images, &n_mount_images);
return 1;
} else if (streq(name, "ExtensionImages")) {
_cleanup_free_ char *format_str = NULL;
MountImage *extension_images = NULL;
size_t n_extension_images = 0;
CLEANUP_ARRAY(extension_images, n_extension_images, mount_image_free_many);
r = sd_bus_message_enter_container(message, 'a', "(sba(ss))");
if (r < 0)
return r;
@@ -4211,15 +4220,21 @@ int bus_exec_context_set_transient_property(
if (!UNIT_WRITE_FLAGS_NOOP(flags)) {
if (n_extension_images == 0) {
c->extension_images = mount_image_free_many(c->extension_images, &c->n_extension_images);
mount_image_free_many(c->extension_images, c->n_extension_images);
c->extension_images = NULL;
c->n_extension_images = 0;
unit_write_settingf(u, flags, name, "%s=", name);
} else {
for (size_t i = 0; i < n_extension_images; ++i) {
r = mount_image_add(&c->extension_images, &c->n_extension_images, &extension_images[i]);
if (r < 0)
return r;
}
if (!c->extension_images) {
c->extension_images = TAKE_PTR(extension_images);
c->n_extension_images = n_extension_images;
} else
FOREACH_ARRAY(i, extension_images, n_extension_images) {
r = mount_image_add(&c->extension_images, &c->n_extension_images, i);
if (r < 0)
return r;
}
unit_write_settingf(u, flags|UNIT_ESCAPE_C|UNIT_ESCAPE_SPECIFIERS,
name,
@@ -4229,8 +4244,6 @@ int bus_exec_context_set_transient_property(
}
}
extension_images = mount_image_free_many(extension_images, &n_extension_images);
return 1;
} else if (STR_IN_SET(name, "StateDirectorySymlink", "RuntimeDirectorySymlink", "CacheDirectorySymlink", "LogsDirectorySymlink")) {
src/core/execute.c
+7 -3
View File
@@ -684,8 +684,6 @@ void exec_context_done(ExecContext *c) {
iovec_done(&c->root_hash_sig);
c->root_hash_sig_path = mfree(c->root_hash_sig_path);
c->root_verity = mfree(c->root_verity);
c->extension_images = mount_image_free_many(c->extension_images, &c->n_extension_images);
c->extension_directories = strv_free(c->extension_directories);
c->tty_path = mfree(c->tty_path);
c->syslog_identifier = mfree(c->syslog_identifier);
c->user = mfree(c->user);
@@ -705,10 +703,16 @@ void exec_context_done(ExecContext *c) {
bind_mount_free_many(c->bind_mounts, c->n_bind_mounts);
c->bind_mounts = NULL;
c->n_bind_mounts = 0;
mount_image_free_many(c->mount_images, c->n_mount_images);
c->mount_images = NULL;
c->n_mount_images = 0;
mount_image_free_many(c->extension_images, c->n_extension_images);
c->extension_images = NULL;
c->n_extension_images = 0;
c->extension_directories = strv_free(c->extension_directories);
temporary_filesystem_free_many(c->temporary_filesystems, c->n_temporary_filesystems);
c->temporary_filesystems = NULL;
c->n_temporary_filesystems = 0;
c->mount_images = mount_image_free_many(c->mount_images, &c->n_mount_images);
cpu_set_done(&c->cpu_set);
numa_policy_reset(&c->numa_policy);
src/core/load-fragment.c
+6 -2
View File
@@ -5175,7 +5175,9 @@ int config_parse_mount_images(
if (isempty(rvalue)) {
/* Empty assignment resets the list */
c->mount_images = mount_image_free_many(c->mount_images, &c->n_mount_images);
mount_image_free_many(c->mount_images, c->n_mount_images);
c->mount_images = NULL;
c->n_mount_images = 0;
return 0;
}
@@ -5323,7 +5325,9 @@ int config_parse_extension_images(
if (isempty(rvalue)) {
/* Empty assignment resets the list */
c->extension_images = mount_image_free_many(c->extension_images, &c->n_extension_images);
mount_image_free_many(c->extension_images, c->n_extension_images);
c->extension_images = NULL;
c->n_extension_images = 0;
return 0;
}
src/core/namespace.c
+6 -9
View File
@@ -3098,19 +3098,16 @@ int bind_mount_add(BindMount **b, size_t *n, const BindMount *item) {
return 0;
}
MountImage* mount_image_free_many(MountImage *m, size_t *n) {
assert(n);
assert(m || *n == 0);
void mount_image_free_many(MountImage *m, size_t n) {
assert(m || n == 0);
for (size_t i = 0; i < *n; i++) {
free(m[i].source);
free(m[i].destination);
mount_options_free_all(m[i].mount_options);
FOREACH_ARRAY(i, m, n) {
free(i->source);
free(i->destination);
mount_options_free_all(i->mount_options);
}
free(m);
*n = 0;
return NULL;
}
int mount_image_add(MountImage **m, size_t *n, const MountImage *item) {
src/core/namespace.h
+8 -5
View File
@@ -286,13 +286,16 @@ DECLARE_STRING_TABLE_LOOKUP(private_pids, PrivatePIDs);
void bind_mount_free_many(BindMount *b, size_t n);
int bind_mount_add(BindMount **b, size_t *n, const BindMount *item);
void temporary_filesystem_free_many(TemporaryFileSystem *t, size_t n);
int temporary_filesystem_add(TemporaryFileSystem **t, size_t *n,
const char *path, const char *options);
MountImage* mount_image_free_many(MountImage *m, size_t *n);
void mount_image_free_many(MountImage *m, size_t n);
int mount_image_add(MountImage **m, size_t *n, const MountImage *item);
void temporary_filesystem_free_many(TemporaryFileSystem *t, size_t n);
int temporary_filesystem_add(
TemporaryFileSystem **t,
size_t *n,
const char *path,
const char *options);
int refresh_extensions_in_namespace(
const PidRef *target,
const char *hierarchy_env,