proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2026-01-06 12:12:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

zebra: fix ipset, iptable, ipset entry memleaks

Browse Source 
Removed from hash, but not freed, on client disconnect.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
This commit is contained in:
Quentin Young 2020-01-14 01:17:01 -05:00
parent c49bafc254
commit b147e20433
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
zebra/zebra_pbr.c
View File

@ -483,8 +483,10 @@ static void zebra_pbr_cleanup_ipset(struct hash_bucket *b, void *data)
int *sock = data;
if (ipset->sock == *sock) {
hook_call(zebra_pbr_ipset_update, 0, ipset);
hash_release(zrouter.ipset_hash, ipset);
if (hash_release(zrouter.ipset_hash, ipset))
zebra_pbr_ipset_free(ipset);
else
hook_call(zebra_pbr_ipset_update, 0, ipset);
}
}
@ -494,8 +496,10 @@ static void zebra_pbr_cleanup_ipset_entry(struct hash_bucket *b, void *data)
int *sock = data;
if (ipset->sock == *sock) {
hook_call(zebra_pbr_ipset_entry_update, 0, ipset);
hash_release(zrouter.ipset_entry_hash, ipset);
if (hash_release(zrouter.ipset_entry_hash, ipset))
zebra_pbr_ipset_entry_free(ipset);
else
hook_call(zebra_pbr_ipset_entry_update, 0, ipset);
}
}
@ -505,8 +509,10 @@ static void zebra_pbr_cleanup_iptable(struct hash_bucket *b, void *data)
int *sock = data;
if (iptable->sock == *sock) {
hook_call(zebra_pbr_iptable_update, 0, iptable);
hash_release(zrouter.iptable_hash, iptable);
if (hash_release(zrouter.iptable_hash, iptable))
zebra_pbr_iptable_free(iptable);
else
hook_call(zebra_pbr_iptable_update, 0, iptable);
}
}