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

mountfsd: fix potential memleak on malicious json message

Browse Source 
This also makes json_log_oom() used on OOM.

Follow-up for 78b40aea61.
This commit is contained in:
Yu Watanabe
2026-01-18 18:03:21 +09:00
parent f02e4b4f38
commit fe7692227d
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mountfsd/mountwork.c
+5 -4
View File
@@ -65,6 +65,7 @@ static const ImagePolicy image_policy_untrusted = {
static int json_dispatch_image_options(const char *name, sd_json_variant *variant, sd_json_dispatch_flags_t flags, void *userdata) {
_cleanup_(mount_options_free_allp) MountOptions *options = NULL;
MountOptions **p = ASSERT_PTR(userdata);
int r;
if (sd_json_variant_is_null(variant)) {
*p = mount_options_free_all(*p);
@@ -87,12 +88,12 @@ static int json_dispatch_image_options(const char *name, sd_json_variant *varian
if (!options) {
options = new0(MountOptions, 1);
if (!options)
return -ENOMEM;
return json_log_oom(variant, flags);
}
options->options[pd] = strdup(sd_json_variant_string(e));
if (!options->options[pd])
return -ENOMEM;
r = free_and_strdup(&options->options[pd], sd_json_variant_string(e));
if (r < 0)
return json_log_oom(variant, flags);
}
mount_options_free_all(*p);