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

lib: Ensure VRF is created with correct id

Browse Source 
In function vrf_get(), an early call to vrf_get_by_name() may end up
creating the Zebra VRF structure prior to the VRF id being set,
resulting in various other misbehavior. Fix this with appropriate
changes.

Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>

Ticket: CM-10258
Reviewed By: CCR-4418
Testing Done: Manual
This commit is contained in:
vivek 2016-04-04 10:58:06 -07:00
parent 66e373aec0
commit 8087b296b4
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/vrf.c
View File

@ -150,6 +150,7 @@ vrf_get (vrf_id_t vrf_id, const char *name)
struct prefix p; struct prefix p;
struct route_node *rn; struct route_node *rn;
struct vrf *vrf = NULL; struct vrf *vrf = NULL;
size_t namelen;
vrf_build_key (vrf_id, &p); vrf_build_key (vrf_id, &p);
rn = route_node_get (vrf_table, &p); rn = route_node_get (vrf_table, &p);
@ -172,7 +173,7 @@ vrf_get (vrf_id_t vrf_id, const char *name)
else else
{ {
if (name) if (name)
vrf = vrf_get_by_name(name); vrf = vrf_list_lookup_by_name(name);
if (vrf) if (vrf)
{ {
@ -182,10 +183,27 @@ vrf_get (vrf_id_t vrf_id, const char *name)
} }
else else
{ {
if (name)
{
namelen = strlen (name);
if (namelen > VRF_NAMSIZ)
{
zlog_err("Attempt to get/create VRF %u name %s - name too long",
vrf_id, name);
return NULL;
}
}
vrf = XCALLOC (MTYPE_VRF, sizeof (struct vrf)); vrf = XCALLOC (MTYPE_VRF, sizeof (struct vrf));
if (debug_vrf) if (debug_vrf)
zlog_debug ("VRF(%u) %s is created.", zlog_debug ("VRF(%u) %s is created.",
vrf_id, (name) ? name : "(NULL)"); vrf_id, (name) ? name : "(NULL)");
if (name)
{
strncpy (vrf->name, name, namelen);
vrf->name[namelen] = '\0';
listnode_add_sort (vrf_list, vrf);
}
} }
vrf->vrf_id = vrf_id; vrf->vrf_id = vrf_id;
rn->info = vrf; rn->info = vrf;