From: Donatas Abraitis <donatas@opensourcerouting.org>
Date: Tue, 6 Sep 2022 09:00:41 +0000 (+0300)
Subject: bgpd: Unlock bgp_dest for some more cases
X-Git-Tag: base_8.4~58^2~2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=8c0044f323a731173d21378c4d208240e85a2ba5;p=mirror%2Ffrr.git

bgpd: Unlock bgp_dest for some more cases

bgp_static_set()
bgp_aggregate_install()

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
---

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index bf82e10096..9045a94ad5 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -6479,6 +6479,7 @@ static int bgp_static_set(struct vty *vty, const char *negate,
 			/* Label index cannot be changed. */
 			if (bgp_static->label_index != label_index) {
 				vty_out(vty, "%% cannot change label-index\n");
+				bgp_dest_unlock_node(dest);
 				return CMD_WARNING_CONFIG_FAILED;
 			}
 
@@ -7263,6 +7264,7 @@ static void bgp_aggregate_install(
 			aggregate, atomic_aggregate, p);
 
 		if (!attr) {
+			bgp_dest_unlock_node(dest);
 			bgp_aggregate_delete(bgp, p, afi, safi, aggregate);
 			if (BGP_DEBUG(update_groups, UPDATE_GROUPS))
 				zlog_debug("%s: %pFX null attribute", __func__,