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

bgpd: fix double free in dampening code

Browse Source 
bgp_damp_info_unclaim already calls bgp_reuselist_del. We must not call
it again here.

Fixes #9046.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
This commit is contained in:
Igor Ryzhov 2021-07-29 00:14:31 +03:00
parent 53d7080980
commit 96d6b8cc29
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bgpd/bgp_damp.c
View File

@ -174,16 +174,9 @@ static void bgp_reuse_list_add(struct bgp_damp_info *bdi,
} }
/* Delete BGP dampening information from reuse list. */ /* Delete BGP dampening information from reuse list. */
static void bgp_reuse_list_delete(struct bgp_damp_info *bdi, static void bgp_reuse_list_delete(struct bgp_damp_info *bdi)
struct bgp_damp_config *bdc)
{ {
struct reuselist *list;
struct reuselist_node *rn;
list = &bdc->reuse_list[bdi->index];
rn = bgp_reuselist_find(list, bdi);
bgp_damp_info_unclaim(bdi); bgp_damp_info_unclaim(bdi);
bgp_reuselist_del(list, &rn);
} }
static void bgp_no_reuse_list_add(struct bgp_damp_info *bdi, static void bgp_no_reuse_list_add(struct bgp_damp_info *bdi,
@ -376,7 +369,7 @@ int bgp_damp_withdraw(struct bgp_path_info *path, struct bgp_dest *dest,
if (CHECK_FLAG(bdi->path->flags, BGP_PATH_DAMPED)) { if (CHECK_FLAG(bdi->path->flags, BGP_PATH_DAMPED)) {
/* If decay rate isn't equal to 0, reinsert brn. */ /* If decay rate isn't equal to 0, reinsert brn. */
if (bdi->penalty != last_penalty) { if (bdi->penalty != last_penalty) {
bgp_reuse_list_delete(bdi, bdc); bgp_reuse_list_delete(bdi);
bgp_reuse_list_add(bdi, bdc); bgp_reuse_list_add(bdi, bdc);
} }
return BGP_DAMP_SUPPRESSED; return BGP_DAMP_SUPPRESSED;
@ -420,7 +413,7 @@ int bgp_damp_update(struct bgp_path_info *path, struct bgp_dest *dest,
else if (CHECK_FLAG(bdi->path->flags, BGP_PATH_DAMPED) else if (CHECK_FLAG(bdi->path->flags, BGP_PATH_DAMPED)
&& (bdi->penalty < bdc->reuse_limit)) { && (bdi->penalty < bdc->reuse_limit)) {
bgp_path_info_unset_flag(dest, path, BGP_PATH_DAMPED); bgp_path_info_unset_flag(dest, path, BGP_PATH_DAMPED);
bgp_reuse_list_delete(bdi, bdc); bgp_reuse_list_delete(bdi);
bgp_no_reuse_list_add(bdi, bdc); bgp_no_reuse_list_add(bdi, bdc);
bdi->suppress_time = 0; bdi->suppress_time = 0;
status = BGP_DAMP_USED; status = BGP_DAMP_USED;