peter/infix
1
0
Fork 0
mirror of https://github.com/kernelkit/infix.git synced 2026-07-30 20:43:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

confd: fix possible resource leak in firewall conf change

Browse Source 
Coverity scan detected a memory leak in the new firewall change() cb
where allocated memory from ietf_interfaces_get_all_l3() was not freed
on error paths when srx_get_diff() failed or returned NULL.

This commit consolidates all cleanup paths to use the 'done:' label,
ensuring ifaces, diff, and cfg are properly freed in all exit scenarios.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg
2025-10-13 11:31:47 +02:00
parent f91aa0b705
commit 20316daf2d
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/confd/src/infix-firewall.c
+5 -5
View File
@@ -542,10 +542,10 @@ static int change(sr_session_ctx_t *session, uint32_t sub_id, const char *module
err = srx_get_diff(session, &diff);
if (err)
goto err_release_data;
goto done;
if (!diff)
goto err_release_data;
goto done;
/* Create /etc/firewalld+ directory structure */
if (fmkpath(0755, FIREWALLD_DIR_NEXT) ||
@@ -554,7 +554,7 @@ static int change(sr_session_ctx_t *session, uint32_t sub_id, const char *module
fmkpath(0755, FIREWALLD_POLICIES_DIR)) {
ERROR("Failed creating " FIREWALLD_DIR_NEXT " directory structure");
err = SR_ERR_SYS;
goto err_release_data;
goto done;
}
if (lydx_get_descendant(diff, "firewall", "default", NULL) ||
@@ -630,7 +630,7 @@ static int change(sr_session_ctx_t *session, uint32_t sub_id, const char *module
if (generate_policy(cnode, name, &priority)) {
ERROR("Failed to generate policy %s", name);
goto err_release_data;
goto done;
}
}
}
@@ -644,7 +644,7 @@ done:
if (diff)
lyd_free_tree(diff);
err_release_data:
if (cfg)
sr_release_data(cfg);