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

rip(ng)d: fix interfaces cleaning

Browse Source 
rip(ng)d_instance_disable unlinks the vrf from the instance which means
that rip(ng)_interfaces_clean never works, because rip(ng)->vrf is
always NULL there. This leads to the crash #6477.

Clean interfaces before disabling the instance to fix the issue.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
This commit is contained in:
Igor Ryzhov 2020-10-09 15:14:58 +03:00
parent e13013d4ba
commit eb6b38854f
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ripd/ripd.c
View File

@ -3422,6 +3422,8 @@ static void rip_distribute_update_all_wrapper(struct access_list *notused)
/* Delete all added rip route. */
void rip_clean(struct rip *rip)
{
rip_interfaces_clean(rip);
if (rip->enabled)
rip_instance_disable(rip);
@ -3443,7 +3445,6 @@ void rip_clean(struct rip *rip)
route_table_finish(rip->enable_network);
vector_free(rip->passive_nondefault);
list_delete(&rip->offset_list_master);
rip_interfaces_clean(rip);
route_table_finish(rip->distance_table);
RB_REMOVE(rip_instance_head, &rip_instances, rip);

3
ripngd/ripngd.c
View File

@ -2533,6 +2533,8 @@ static void ripng_distribute_update_all_wrapper(struct access_list *notused)
/* delete all the added ripng routes. */
void ripng_clean(struct ripng *ripng)
{
ripng_interface_clean(ripng);
if (ripng->enabled)
ripng_instance_disable(ripng);
@ -2554,7 +2556,6 @@ void ripng_clean(struct ripng *ripng)
agg_table_finish(ripng->enable_network);
vector_free(ripng->passive_interface);
list_delete(&ripng->offset_list_master);
ripng_interface_clean(ripng);
RB_REMOVE(ripng_instance_head, &ripng_instances, ripng);
XFREE(MTYPE_RIPNG_VRF_NAME, ripng->vrf_name);