proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-04 12:48:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #12496 from opensourcerouting/ldpd-memleak-plug

Browse Source 
lib: fix capability double resource allocation
This commit is contained in:
Mark Stapp 2022-12-12 11:14:10 -05:00 committed by GitHub
commit a2f9eb5cca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
lib/privs.c
View File

@ -261,8 +261,34 @@ zebra_privs_current_t zprivs_state_caps(void)
return ZPRIVS_LOWERED;
}
/** Release private cap state if allocated. */
static void zprivs_state_free_caps(void)
{
if (zprivs_state.syscaps_p) {
if (zprivs_state.syscaps_p->num)
XFREE(MTYPE_PRIVS, zprivs_state.syscaps_p->caps);
XFREE(MTYPE_PRIVS, zprivs_state.syscaps_p);
}
if (zprivs_state.syscaps_i) {
if (zprivs_state.syscaps_i->num)
XFREE(MTYPE_PRIVS, zprivs_state.syscaps_i->caps);
XFREE(MTYPE_PRIVS, zprivs_state.syscaps_i);
}
if (zprivs_state.caps) {
cap_free(zprivs_state.caps);
zprivs_state.caps = NULL;
}
}
static void zprivs_caps_init(struct zebra_privs_t *zprivs)
{
/* Release allocated zcaps if this function was called before. */
zprivs_state_free_caps();
zprivs_state.syscaps_p = zcaps2sys(zprivs->caps_p, zprivs->cap_num_p);
zprivs_state.syscaps_i = zcaps2sys(zprivs->caps_i, zprivs->cap_num_i);
@ -362,18 +388,7 @@ static void zprivs_caps_terminate(void)
exit(1);
}
/* free up private state */
if (zprivs_state.syscaps_p && zprivs_state.syscaps_p->num) {
XFREE(MTYPE_PRIVS, zprivs_state.syscaps_p->caps);
XFREE(MTYPE_PRIVS, zprivs_state.syscaps_p);
}
if (zprivs_state.syscaps_i && zprivs_state.syscaps_i->num) {
XFREE(MTYPE_PRIVS, zprivs_state.syscaps_i->caps);
XFREE(MTYPE_PRIVS, zprivs_state.syscaps_i);
}
cap_free(zprivs_state.caps);
zprivs_state_free_caps();
}
#else /* !HAVE_LCAPS */
#error "no Linux capabilities, dazed and confused..."