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

zebra: Prevent duplication and overflow in nhe2grp

Browse Source 
The kernel does not allow duplicate IDs in the same group, but
we are perfectly find with it internally if two different
nexthops resolve the the same nexthop (default route for instance).
So, we have to handle this when we get ready to install.

Further, pass the max group size in the arguments to ensure we
don't overflow. Don't actually think this is possible due to
multipath checking in nexthop_active_update() but better to be
safe.

Signed-off-by: Stephen Worley <sworley@cumulusnetworks.com>
This commit is contained in:
Stephen Worley 2019-07-25 13:27:59 -04:00
parent 4b87c90d58
commit 8dbc800f42
3 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zebra/zebra_dplane.c
View File

@ -1589,8 +1589,8 @@ static int dplane_ctx_nexthop_init(struct zebra_dplane_ctx *ctx,
/* If its a group, convert it to a grp array of ids */
if (!zebra_nhg_depends_is_empty(nhe)
&& !CHECK_FLAG(nhe->flags, NEXTHOP_GROUP_RECURSIVE))
ctx->u.rinfo.nhe.nh_grp_count =
zebra_nhg_nhe2grp(ctx->u.rinfo.nhe.nh_grp, nhe);
ctx->u.rinfo.nhe.nh_grp_count = zebra_nhg_nhe2grp(
ctx->u.rinfo.nhe.nh_grp, nhe, MULTIPATH_NUM);
zns = ((struct zebra_vrf *)vrf_info_lookup(nhe->vrf_id))->zns;

26
zebra/zebra_nhg.c
View File

@ -1444,13 +1444,16 @@ done:
}
/* Convert a nhe into a group array */
uint8_t zebra_nhg_nhe2grp(struct nh_grp *grp, struct nhg_hash_entry *nhe)
uint8_t zebra_nhg_nhe2grp(struct nh_grp *grp, struct nhg_hash_entry *nhe,
int max_num)
{
struct nhg_connected *rb_node_dep = NULL;
struct nhg_hash_entry *depend = NULL;
uint8_t i = 0;
frr_each (nhg_connected_tree, &nhe->nhg_depends, rb_node_dep) {
bool duplicate = false;
depend = rb_node_dep->nhe;
/*
@ -1467,11 +1470,24 @@ uint8_t zebra_nhg_nhe2grp(struct nh_grp *grp, struct nhg_hash_entry *nhe)
}
}
grp[i].id = depend->id;
/* We aren't using weights for anything right now */
grp[i].weight = 0;
i++;
/* Check for duplicate IDs, kernel doesn't like that */
for (int j = 0; j < i; j++) {
if (depend->id == grp[j].id)
duplicate = true;
}
if (!duplicate) {
grp[i].id = depend->id;
/* We aren't using weights for anything right now */
grp[i].weight = 0;
i++;
}
if (i >= max_num)
goto done;
}
done:
return i;
}

4
zebra/zebra_nhg.h
View File

@ -236,8 +236,8 @@ extern int nexthop_active_update(struct route_node *rn, struct route_entry *re);
extern int zebra_nhg_re_update_ref(struct route_entry *re,
struct nhg_hash_entry *nhe);
extern uint8_t zebra_nhg_nhe2grp(struct nh_grp *grp,
struct nhg_hash_entry *nhe);
extern uint8_t zebra_nhg_nhe2grp(struct nh_grp *grp, struct nhg_hash_entry *nhe,
int size);
void zebra_nhg_install_kernel(struct nhg_hash_entry *nhe);
void zebra_nhg_uninstall_kernel(struct nhg_hash_entry *nhe);