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

lib: fix interface nb stale pointers

Browse Source 
The first change in this commit is the processing of the VRF termination.
When we terminate the VRF, we should not delete the underlying interfaces,
because there may be pointers to them in the northbound configuration. We
should move them to the default VRF instead.

Because of the first change, the VRF interface itself is also not deleted
when deleting the VRF. It should be handled in netlink_link_change. This
is done by the second change.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
This commit is contained in:
Igor Ryzhov 2021-04-08 15:43:07 +03:00
parent 9d78be6aac
commit af736200e1
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/if.c
View File

@ -1056,15 +1056,30 @@ struct connected *connected_get_linklocal(struct interface *ifp)
void if_terminate(struct vrf *vrf) void if_terminate(struct vrf *vrf)
{ {
struct interface *ifp; struct interface *ifp;
bool delete;
/*
* If the default VRF is being terminated or has
* already been terminated it means that
* the program is shutting down and we need to
* delete all the interfaces. Otherwise, we only
* need to move VRF's interfaces to the default VRF.
*/
delete = vrf_is_backend_netns() || vrf->vrf_id == VRF_DEFAULT
|| !vrf_lookup_by_id(VRF_DEFAULT);
while (!RB_EMPTY(if_name_head, &vrf->ifaces_by_name)) { while (!RB_EMPTY(if_name_head, &vrf->ifaces_by_name)) {
ifp = RB_ROOT(if_name_head, &vrf->ifaces_by_name); ifp = RB_ROOT(if_name_head, &vrf->ifaces_by_name);
if (ifp->node) { if (delete) {
ifp->node->info = NULL; if (ifp->node) {
route_unlock_node(ifp->node); ifp->node->info = NULL;
route_unlock_node(ifp->node);
}
if_delete(&ifp);
} else {
if_update_to_new_vrf(ifp, VRF_DEFAULT);
} }
if_delete(&ifp);
} }
} }

3
zebra/if_netlink.c
View File

@ -1661,8 +1661,7 @@ int netlink_link_change(struct nlmsghdr *h, ns_id_t ns_id, int startup)
else if (IS_ZEBRA_IF_VXLAN(ifp)) else if (IS_ZEBRA_IF_VXLAN(ifp))
zebra_l2_vxlanif_del(ifp); zebra_l2_vxlanif_del(ifp);
if (!IS_ZEBRA_IF_VRF(ifp)) if_delete_update(ifp);
if_delete_update(ifp);
} }
return 0; return 0;