proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 10:09:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #14908 from Keelan10/zebra-tc-leak

Browse Source 
zebra: Set Free Functions for Traffic Control Hash Tables
This commit is contained in:
Donald Sharp 2023-11-29 13:48:45 -05:00 committed by GitHub
commit 8a72affa69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zebra/zebra_router.c
View File

@ -241,9 +241,9 @@ void zebra_router_terminate(void)
zebra_pbr_ipset_entry_free); zebra_pbr_ipset_entry_free);
hash_clean_and_free(&zrouter.ipset_hash, zebra_pbr_ipset_free); hash_clean_and_free(&zrouter.ipset_hash, zebra_pbr_ipset_free);
hash_clean_and_free(&zrouter.iptable_hash, zebra_pbr_iptable_free); hash_clean_and_free(&zrouter.iptable_hash, zebra_pbr_iptable_free);
hash_clean_and_free(&zrouter.filter_hash, NULL); hash_clean_and_free(&zrouter.filter_hash, (void (*)(void *)) zebra_tc_filter_free);
hash_clean_and_free(&zrouter.qdisc_hash, NULL); hash_clean_and_free(&zrouter.qdisc_hash, (void (*)(void *)) zebra_tc_qdisc_free);
hash_clean_and_free(&zrouter.class_hash, NULL); hash_clean_and_free(&zrouter.class_hash, (void (*)(void *)) zebra_tc_class_free);
#ifdef HAVE_SCRIPTING #ifdef HAVE_SCRIPTING
zebra_script_destroy(); zebra_script_destroy();

23
zebra/zebra_tc.c
View File

@ -132,13 +132,18 @@ static void *tc_qdisc_alloc_intern(void *arg)
return new; return new;
} }
void zebra_tc_qdisc_free(struct zebra_tc_qdisc *qdisc)
{
XFREE(MTYPE_TC_QDISC, qdisc);
}
static struct zebra_tc_qdisc *tc_qdisc_free(struct zebra_tc_qdisc *hash_data, static struct zebra_tc_qdisc *tc_qdisc_free(struct zebra_tc_qdisc *hash_data,
bool free_data) bool free_data)
{ {
hash_release(zrouter.qdisc_hash, hash_data); hash_release(zrouter.qdisc_hash, hash_data);
if (free_data) { if (free_data) {
XFREE(MTYPE_TC_QDISC, hash_data); zebra_tc_qdisc_free(hash_data);
return NULL; return NULL;
} }
@ -178,7 +183,7 @@ void zebra_tc_qdisc_install(struct zebra_tc_qdisc *qdisc)
new = hash_get(zrouter.qdisc_hash, qdisc, new = hash_get(zrouter.qdisc_hash, qdisc,
tc_qdisc_alloc_intern); tc_qdisc_alloc_intern);
(void)dplane_tc_qdisc_install(new); (void)dplane_tc_qdisc_install(new);
XFREE(MTYPE_TC_QDISC, old); zebra_tc_qdisc_free(old);
} }
} else { } else {
new = hash_get(zrouter.qdisc_hash, qdisc, new = hash_get(zrouter.qdisc_hash, qdisc,
@ -243,13 +248,18 @@ static void *tc_class_alloc_intern(void *arg)
return new; return new;
} }
void zebra_tc_class_free(struct zebra_tc_class *class)
{
XFREE(MTYPE_TC_CLASS, class);
}
static struct zebra_tc_class *tc_class_free(struct zebra_tc_class *hash_data, static struct zebra_tc_class *tc_class_free(struct zebra_tc_class *hash_data,
bool free_data) bool free_data)
{ {
hash_release(zrouter.class_hash, hash_data); hash_release(zrouter.class_hash, hash_data);
if (free_data) { if (free_data) {
XFREE(MTYPE_TC_CLASS, hash_data); zebra_tc_class_free(hash_data);
return NULL; return NULL;
} }
@ -353,13 +363,18 @@ bool zebra_tc_filter_hash_equal(const void *arg1, const void *arg2)
return true; return true;
} }
void zebra_tc_filter_free(struct zebra_tc_filter *filter)
{
XFREE(MTYPE_TC_FILTER, filter);
}
static struct zebra_tc_filter *tc_filter_free(struct zebra_tc_filter *hash_data, static struct zebra_tc_filter *tc_filter_free(struct zebra_tc_filter *hash_data,
bool free_data) bool free_data)
{ {
hash_release(zrouter.filter_hash, hash_data); hash_release(zrouter.filter_hash, hash_data);
if (free_data) { if (free_data) {
XFREE(MTYPE_TC_FILTER, hash_data); zebra_tc_filter_free(hash_data);
return NULL; return NULL;
} }

3
zebra/zebra_tc.h
View File

@ -42,16 +42,19 @@ uint32_t zebra_tc_qdisc_hash_key(const void *arg);
bool zebra_tc_qdisc_hash_equal(const void *arg1, const void *arg2); bool zebra_tc_qdisc_hash_equal(const void *arg1, const void *arg2);
void zebra_tc_qdisc_install(struct zebra_tc_qdisc *qdisc); void zebra_tc_qdisc_install(struct zebra_tc_qdisc *qdisc);
void zebra_tc_qdisc_uninstall(struct zebra_tc_qdisc *qdisc); void zebra_tc_qdisc_uninstall(struct zebra_tc_qdisc *qdisc);
void zebra_tc_qdisc_free(struct zebra_tc_qdisc *qdisc);
uint32_t zebra_tc_class_hash_key(const void *arg); uint32_t zebra_tc_class_hash_key(const void *arg);
bool zebra_tc_class_hash_equal(const void *arg1, const void *arg2); bool zebra_tc_class_hash_equal(const void *arg1, const void *arg2);
void zebra_tc_class_add(struct zebra_tc_class *class); void zebra_tc_class_add(struct zebra_tc_class *class);
void zebra_tc_class_delete(struct zebra_tc_class *class); void zebra_tc_class_delete(struct zebra_tc_class *class);
void zebra_tc_class_free(struct zebra_tc_class *class);
const char *tc_filter_kind2str(uint32_t type); const char *tc_filter_kind2str(uint32_t type);
enum tc_qdisc_kind tc_filter_str2kind(const char *type); enum tc_qdisc_kind tc_filter_str2kind(const char *type);
void zebra_tc_filter_add(struct zebra_tc_filter *filter); void zebra_tc_filter_add(struct zebra_tc_filter *filter);
void zebra_tc_filter_delete(struct zebra_tc_filter *filter); void zebra_tc_filter_delete(struct zebra_tc_filter *filter);
void zebra_tc_filter_free(struct zebra_tc_filter *filter);
void zebra_tc_filters_free(void *arg); void zebra_tc_filters_free(void *arg);
uint32_t zebra_tc_filter_hash_key(const void *arg); uint32_t zebra_tc_filter_hash_key(const void *arg);