mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-11-09 12:48:43 +00:00
Code Releases Activity

Interfaces: fixed locking when address is deleted implicitly

Browse Source
This commit is contained in:
Maria Matejka 2024-01-27 19:01:34 +01:00
parent 57b5eb5cbd
commit f9d3112d01
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
nest/iface.c
View File

@ -50,6 +50,8 @@ struct iface default_vrf;
static void if_recalc_preferred(struct iface *i); static void if_recalc_preferred(struct iface *i);
static void ifa_delete_locked(struct ifa *a);
static void ifa_dump_locked(struct ifa *); static void ifa_dump_locked(struct ifa *);
static void if_dump_locked(struct iface *); static void if_dump_locked(struct iface *);
@ -545,7 +547,7 @@ if_end_update(void)
{ {
WALK_LIST_DELSAFE(a, b, i->addrs) WALK_LIST_DELSAFE(a, b, i->addrs)
if (!(a->flags & IA_UPDATED)) if (!(a->flags & IA_UPDATED))
ifa_delete(a); ifa_delete_locked(a);
if_end_partial_update_locked(i); if_end_partial_update_locked(i);
} }
} }
@ -891,7 +893,7 @@ ifa_update(struct ifa *a)
IFACE_UNLOCK; IFACE_UNLOCK;
return b; return b;
} }
ifa_delete(b); ifa_delete_locked(b);
break; break;
} }
@ -924,11 +926,19 @@ ifa_update(struct ifa *a)
void void
ifa_delete(struct ifa *a) ifa_delete(struct ifa *a)
{ {
IFACE_LOCK;
ifa_delete_locked(a);
IFACE_UNLOCK;
}
static void
ifa_delete_locked(struct ifa *a)
{
IFACE_ASSERT_LOCKED;
struct iface *i = a->iface; struct iface *i = a->iface;
struct ifa *b; struct ifa *b;
IFACE_LOCK;
WALK_LIST(b, i->addrs) WALK_LIST(b, i->addrs)
if (ifa_same(b, a)) if (ifa_same(b, a))
{ {
@ -953,11 +963,8 @@ ifa_delete(struct ifa *a)
ifa_notify_change(IF_CHANGE_DOWN, b); ifa_notify_change(IF_CHANGE_DOWN, b);
ifa_unlink(b); ifa_unlink(b);
IFACE_UNLOCK;
return; return;
} }
IFACE_UNLOCK;
} }
u32 u32