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

Merge pull request #5066 from ak503/libfrr_crash

Browse Source 
zebra: if_is_loopback_or_vrf crash if if_lookup_by_index return NULL
This commit is contained in:
Donald Sharp 2019-09-26 19:32:41 -04:00 committed by GitHub
commit 5c256b572c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zebra/zebra_rib.c
View File

@ -1046,14 +1046,18 @@ static struct route_entry *rib_choose_best(struct route_entry *current,
struct nexthop *nexthop = NULL; struct nexthop *nexthop = NULL;
for (ALL_NEXTHOPS(alternate->ng, nexthop)) { for (ALL_NEXTHOPS(alternate->ng, nexthop)) {
if (if_is_loopback_or_vrf(if_lookup_by_index( struct interface *ifp = if_lookup_by_index(
nexthop->ifindex, alternate->vrf_id))) nexthop->ifindex, alternate->vrf_id);
if (ifp && if_is_loopback_or_vrf(ifp))
return alternate; return alternate;
} }
for (ALL_NEXTHOPS(current->ng, nexthop)) { for (ALL_NEXTHOPS(current->ng, nexthop)) {
if (if_is_loopback_or_vrf(if_lookup_by_index( struct interface *ifp = if_lookup_by_index(
nexthop->ifindex, current->vrf_id))) nexthop->ifindex, current->vrf_id);
if (ifp && if_is_loopback_or_vrf(ifp))
return current; return current;
} }