Merge pull request #17132 from FRRouting/mergify/bp/stable/9.1/pr-17116

zebra: unlock node only after operation in zebra_free_rnh() (backport #17116)

1 files changed, 1 insertions, 2 deletions

diff --git a/zebra/zebra_rnh.c b/zebra/zebra_rnh.c
index aeb7ae35b6..0bfa2b9776 100644
--- a/zebra/zebra_rnh.c
+++ b/zebra/zebra_rnh.c
@@ -220,10 +220,9 @@ void zebra_free_rnh(struct rnh *rnh)
 		if (rern) {
 			rib_dest_t *dest;
 
-			route_unlock_node(rern);
-
 			dest = rib_dest_from_rnode(rern);
 			rnh_list_del(&dest->nht, rnh);
+			route_unlock_node(rern);
 		}
 	}
 	free_state(rnh->vrf_id, rnh->state, rnh->node);