shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-11 20:58:27 +03:00
Code

Merge pull request #28551 from mrc0mmand/unit-cleanup-set

Browse Source 
core: free the strings in the set as well during unit cleanup
This commit is contained in:
Luca Boccassi 2023-07-28 13:57:01 +01:00 committed by GitHub
commit 1108285baa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/cgroup.c
View File

@ -287,7 +287,7 @@ void cgroup_context_done(CGroupContext *c) {
while (c->bpf_foreign_programs) while (c->bpf_foreign_programs)
cgroup_context_remove_bpf_foreign_program(c, c->bpf_foreign_programs); cgroup_context_remove_bpf_foreign_program(c, c->bpf_foreign_programs);
c->restrict_network_interfaces = set_free(c->restrict_network_interfaces); c->restrict_network_interfaces = set_free_free(c->restrict_network_interfaces);
cpu_set_reset(&c->cpuset_cpus); cpu_set_reset(&c->cpuset_cpus);
cpu_set_reset(&c->startup_cpuset_cpus); cpu_set_reset(&c->startup_cpuset_cpus);

8
src/core/execute.c
View File

@ -6165,7 +6165,7 @@ void exec_context_done(ExecContext *c) {
c->apparmor_profile = mfree(c->apparmor_profile); c->apparmor_profile = mfree(c->apparmor_profile);
c->smack_process_label = mfree(c->smack_process_label); c->smack_process_label = mfree(c->smack_process_label);
c->restrict_filesystems = set_free(c->restrict_filesystems); c->restrict_filesystems = set_free_free(c->restrict_filesystems);
c->syscall_filter = hashmap_free(c->syscall_filter); c->syscall_filter = hashmap_free(c->syscall_filter);
c->syscall_archs = set_free(c->syscall_archs); c->syscall_archs = set_free(c->syscall_archs);
@ -6177,8 +6177,8 @@ void exec_context_done(ExecContext *c) {
c->log_level_max = -1; c->log_level_max = -1;
exec_context_free_log_extra_fields(c); exec_context_free_log_extra_fields(c);
c->log_filter_allowed_patterns = set_free(c->log_filter_allowed_patterns); c->log_filter_allowed_patterns = set_free_free(c->log_filter_allowed_patterns);
c->log_filter_denied_patterns = set_free(c->log_filter_denied_patterns); c->log_filter_denied_patterns = set_free_free(c->log_filter_denied_patterns);
c->log_ratelimit_interval_usec = 0; c->log_ratelimit_interval_usec = 0;
c->log_ratelimit_burst = 0; c->log_ratelimit_burst = 0;
@ -6193,7 +6193,7 @@ void exec_context_done(ExecContext *c) {
c->load_credentials = hashmap_free(c->load_credentials); c->load_credentials = hashmap_free(c->load_credentials);
c->set_credentials = hashmap_free(c->set_credentials); c->set_credentials = hashmap_free(c->set_credentials);
c->import_credentials = set_free(c->import_credentials); c->import_credentials = set_free_free(c->import_credentials);
c->root_image_policy = image_policy_free(c->root_image_policy); c->root_image_policy = image_policy_free(c->root_image_policy);
c->mount_image_policy = image_policy_free(c->mount_image_policy); c->mount_image_policy = image_policy_free(c->mount_image_policy);