Merge pull request #17129 from FRRouting/mergify/bp/dev/10.2/pr-17116

donaldsharp · web-flow · commit a8c517528499 · 2024-10-16T12:49:30.000-04:00
zebra: unlock node only after operation in zebra_free_rnh() (backport #17116)
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -220,10 +220,9 @@ void zebra_free_rnh(struct rnh *rnh)`
`220`	`220`	`if (rern) {`
`221`	`221`	`rib_dest_t *dest;`
`222`	`222`
`223`		`- route_unlock_node(rern);`
`224`		`-`
`225`	`223`	`dest = rib_dest_from_rnode(rern);`
`226`	`224`	`rnh_list_del(&dest->nht, rnh);`
	`225`	`+ route_unlock_node(rern);`
`227`	`226`	`}`
`228`	`227`	`}`
`229`	`228`	`free_state(rnh->vrf_id, rnh->state, rnh->node);`