mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2025-01-09 18:41:55 +00:00
Code Releases Activity

BGP: fixed deterministic med crashes

Browse Source 
There were several places of forgotten NULL checks.

Thanks to Alarig Le Lay <alarig@swordarmor.fr> for reporting:
https://trubka.network.cz/pipermail/bird-users/2024-December/017990.html
This commit is contained in:
Maria Matejka 2025-01-07 11:08:04 +01:00
parent b58bfcad68
commit c5b07695ce
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nest/rt-table.c
View File

@ -2024,12 +2024,22 @@ rte_recalculate(struct rtable_private *table, struct rt_import_hook *c, struct n
do_recalculate:
/* Add the new route to the list right behind the old one */
if (new_stored)
{
/* There is the same piece of code several lines farther. Needs refactoring.
* The old_stored check is needed because of the possible jump from deterministic med */
if (old_stored)
{
atomic_store_explicit(&new_stored->next, atomic_load_explicit(&old_stored->next, memory_order_relaxed), memory_order_release);
atomic_store_explicit(&old_stored->next, new_stored, memory_order_release);
table->rt_count++;
}
else
{
atomic_store_explicit(&new_stored->next, NULL, memory_order_release);
atomic_store_explicit(last_ptr, new_stored, memory_order_release);
}
table->rt_count++;
}
/* Find a new optimal route (if there is any) */
struct rte_storage * _Atomic *bp = &local_sentinel.next;

8
proto/bgp/attrs.c
View File

@ -2689,10 +2689,10 @@ bgp_rte_recalculate(struct rtable_private *table, net *net,
struct rte_storage *new_stored, struct rte_storage *old_stored, struct rte_storage *old_best_stored)
{
struct rte_storage *key_stored = new_stored ? new_stored : old_stored;
const struct rte *new = &new_stored->rte,
*old = &old_stored->rte,
*old_best = &old_best_stored->rte,
*key = &key_stored->rte;
const struct rte *new = RTE_OR_NULL(new_stored),
*old = RTE_OR_NULL(old_stored),
*old_best = RTE_OR_NULL(old_best_stored),
*key = RTE_OR_NULL(key_stored);
u32 lpref = rt_get_preference(key);
u32 lasn = bgp_get_neighbor(key);