mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-08-13 19:39:28 +00:00
lib: Fix bug in prefix trie lookup
* lib/table.c: (route_node_match) fix overshoot that was causing this function to go 1 bit too far and thus reading past end of prefix. (route_node_lookup) be defensive - don't assume others will clean up leaves when removing info.
This commit is contained in:
parent
d358344759
commit
f8416810aa
14
lib/table.c
14
lib/table.c
@ -209,6 +209,10 @@ route_node_match (const struct route_table *table, const struct prefix *p)
|
||||
{
|
||||
if (node->info)
|
||||
matched = node;
|
||||
|
||||
if (node->p.prefixlen == p->prefixlen)
|
||||
break;
|
||||
|
||||
node = node->link[prefix_bit(&p->u.prefix, node->p.prefixlen)];
|
||||
}
|
||||
|
||||
@ -260,8 +264,8 @@ route_node_lookup (struct route_table *table, struct prefix *p)
|
||||
while (node && node->p.prefixlen <= p->prefixlen &&
|
||||
prefix_match (&node->p, p))
|
||||
{
|
||||
if (node->p.prefixlen == p->prefixlen && node->info)
|
||||
return route_lock_node (node);
|
||||
if (node->p.prefixlen == p->prefixlen)
|
||||
return node->info ? route_lock_node (node) : NULL;
|
||||
|
||||
node = node->link[prefix_bit(&p->u.prefix, node->p.prefixlen)];
|
||||
}
|
||||
@ -283,10 +287,8 @@ route_node_get (struct route_table *table, struct prefix *p)
|
||||
prefix_match (&node->p, p))
|
||||
{
|
||||
if (node->p.prefixlen == p->prefixlen)
|
||||
{
|
||||
route_lock_node (node);
|
||||
return node;
|
||||
}
|
||||
return route_lock_node (node);
|
||||
|
||||
match = node;
|
||||
node = node->link[prefix_bit(&p->u.prefix, node->p.prefixlen)];
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user