diff options
| author | Donatas Abraitis <donatas@opensourcerouting.org> | 2024-09-23 10:24:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-23 10:24:52 +0200 |
| commit | 9616304e471f2f1389bb02aa69799beff55be123 (patch) | |
| tree | ac1044b46a53f58899fff80a0ce1afa55018916d | |
| parent | fa200e837b1d027fd0d502c518cbbc84898c26d3 (diff) | |
| parent | c40635c5c25cac218c9a5eede14721965f87e749 (diff) | |
Merge pull request #16882 from mjstapp/fix_if_table_unlock
zebra: unlock if_table route_nodes
| -rw-r--r-- | zebra/if_netlink.c | 8 | ||||
| -rw-r--r-- | zebra/zebra_evpn.c | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/zebra/if_netlink.c b/zebra/if_netlink.c index 3233519873..5fb908eb0d 100644 --- a/zebra/if_netlink.c +++ b/zebra/if_netlink.c @@ -1799,14 +1799,18 @@ int netlink_tunneldump_read(struct zebra_ns *zns) ret = netlink_request_tunneldump(zns, PF_BRIDGE, tmp_if->ifindex); - if (ret < 0) + if (ret < 0) { + route_unlock_node(rn); return ret; + } ret = netlink_parse_info(netlink_link_change, netlink_cmd, &dp_info, 0, true); - if (ret < 0) + if (ret < 0) { + route_unlock_node(rn); return ret; + } } return 0; diff --git a/zebra/zebra_evpn.c b/zebra/zebra_evpn.c index ebb5a42298..a733b5917f 100644 --- a/zebra/zebra_evpn.c +++ b/zebra/zebra_evpn.c @@ -663,6 +663,7 @@ static int zebra_evpn_map_vlan_ns(struct ns *ns, vni_id = zebra_vxlan_if_access_vlan_vni_find(zif, br_if); if (vni_id) { found = 1; + route_unlock_node(rn); break; } } @@ -757,6 +758,7 @@ static int zebra_evpn_from_svi_ns(struct ns *ns, zebra_vxlan_if_access_vlan_vni_find(zif, br_if); if (vni_id) { found = 1; + route_unlock_node(rn); break; } } @@ -842,6 +844,7 @@ static int zvni_map_to_macvlan_ns(struct ns *ns, void *_in_param, void **_p_ifp) if (zif->link == in_param->svi_if) { *p_ifp = tmp_if; + route_unlock_node(rn); return NS_WALK_STOP; } } |