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

Merge pull request #2877 from pguibert6WIND/fixup_fs_master

Browse Source 
bgpd: avoid memory leak in bgp flowspec list, plus usage of bool
This commit is contained in:
Donald Sharp 2018-08-21 18:46:42 -04:00 committed by GitHub
commit 962709b8d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bgpd/bgp_flowspec_vty.c
View File

@ -335,7 +335,7 @@ void route_vty_out_flowspec(struct vty *vty, struct prefix *p,
struct listnode *node; struct listnode *node;
struct bgp_pbr_match_entry *bpme; struct bgp_pbr_match_entry *bpme;
struct bgp_pbr_match *bpm; struct bgp_pbr_match *bpm;
int unit = 0; bool list_began = false;
struct list *list_bpm; struct list *list_bpm;
list_bpm = list_new(); list_bpm = list_new();
@ -347,14 +347,14 @@ void route_vty_out_flowspec(struct vty *vty, struct prefix *p,
if (listnode_lookup(list_bpm, bpm)) if (listnode_lookup(list_bpm, bpm))
continue; continue;
listnode_add(list_bpm, bpm); listnode_add(list_bpm, bpm);
if (unit == 0) if (!list_began) {
vty_out(vty, " ("); vty_out(vty, " (");
else list_began = true;
} else
vty_out(vty, ", "); vty_out(vty, ", ");
vty_out(vty, "%s", bpm->ipset_name); vty_out(vty, "%s", bpm->ipset_name);
unit++;
} }
if (unit) if (list_began)
vty_out(vty, ")"); vty_out(vty, ")");
vty_out(vty, "\n"); vty_out(vty, "\n");
list_delete_and_null(&list_bpm); list_delete_and_null(&list_bpm);

13
bgpd/bgp_pbr.c
View File

@ -1680,7 +1680,7 @@ static void bgp_pbr_dump_entry(struct bgp_pbr_filter *bpf, bool add)
? "!" : "", ? "!" : "",
bpf->dscp->val); bpf->dscp->val);
} }
zlog_info("BGP: %s FS PBR from %s to %s, %s %s", zlog_debug("BGP: %s FS PBR from %s to %s, %s %s",
add ? "adding" : "removing", add ? "adding" : "removing",
bpf->src == NULL ? "<all>" : bpf->src == NULL ? "<all>" :
prefix2str(bpf->src, bufsrc, sizeof(bufsrc)), prefix2str(bpf->src, bufsrc, sizeof(bufsrc)),
@ -1807,7 +1807,7 @@ static void bgp_pbr_policyroute_add_to_zebra_unit(struct bgp *bgp,
bgp_pbr_match_alloc_intern); bgp_pbr_match_alloc_intern);
/* new, then self allocate ipset_name and unique */ /* new, then self allocate ipset_name and unique */
if (bpm && bpm->unique == 0) { if (bpm->unique == 0) {
bpm->unique = ++bgp_pbr_match_counter_unique; bpm->unique = ++bgp_pbr_match_counter_unique;
/* 0 value is forbidden */ /* 0 value is forbidden */
sprintf(bpm->ipset_name, "match%p", bpm); sprintf(bpm->ipset_name, "match%p", bpm);
@ -1838,10 +1838,9 @@ static void bgp_pbr_policyroute_add_to_zebra_unit(struct bgp *bgp,
temp2.src_port_max = src_port ? src_port->max_port : 0; temp2.src_port_max = src_port ? src_port->max_port : 0;
temp2.dst_port_max = dst_port ? dst_port->max_port : 0; temp2.dst_port_max = dst_port ? dst_port->max_port : 0;
temp2.proto = bpf->protocol; temp2.proto = bpf->protocol;
if (bpm) bpme = hash_get(bpm->entry_hash, &temp2,
bpme = hash_get(bpm->entry_hash, &temp2, bgp_pbr_match_entry_alloc_intern);
bgp_pbr_match_entry_alloc_intern); if (bpme->unique == 0) {
if (bpme && bpme->unique == 0) {
bpme->unique = ++bgp_pbr_match_entry_counter_unique; bpme->unique = ++bgp_pbr_match_entry_counter_unique;
/* 0 value is forbidden */ /* 0 value is forbidden */
bpme->backpointer = bpm; bpme->backpointer = bpm;
@ -1853,7 +1852,7 @@ static void bgp_pbr_policyroute_add_to_zebra_unit(struct bgp *bgp,
bpme_found = true; bpme_found = true;
/* already installed */ /* already installed */
if (bpme_found && bpme) { if (bpme_found) {
struct bgp_info_extra *extra = bgp_info_extra_get(binfo); struct bgp_info_extra *extra = bgp_info_extra_get(binfo);
if (extra && extra->bgp_fs_pbr && if (extra && extra->bgp_fs_pbr &&

3
bgpd/bgp_route.c
View File

@ -198,8 +198,7 @@ static void bgp_info_extra_free(struct bgp_info_extra **extra)
bgp_unlock(e->bgp_orig); bgp_unlock(e->bgp_orig);
if ((*extra)->bgp_fs_pbr) if ((*extra)->bgp_fs_pbr)
list_delete_all_node((*extra)->bgp_fs_pbr); list_delete_and_null(&((*extra)->bgp_fs_pbr));
(*extra)->bgp_fs_pbr = NULL;
XFREE(MTYPE_BGP_ROUTE_EXTRA, *extra); XFREE(MTYPE_BGP_ROUTE_EXTRA, *extra);
*extra = NULL; *extra = NULL;