Merge pull request #10037 from FRRouting/mergify/bp/stable/8.0/pr-10035

ospfd: Prevent use after free on shutdown (backport #10035)
FRRouting · Nov 12, 2021 · 726d103 · 726d103
2 parents 471e76a + 0f7adc2
commit 726d103
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/ospfd/ospf_interface.c b/ospfd/ospf_interface.c
@@ -705,11 +705,11 @@ static int ospf_if_delete_hook(struct interface *ifp)
 	 */
 	ospf_del_if_params(ifp, IF_DEF_PARAMS(ifp));
 
-	route_table_finish(IF_OIFS(ifp));
-
 	for (rn = route_top(IF_OIFS_PARAMS(ifp)); rn; rn = route_next(rn))
 		if (rn->info)
 			ospf_del_if_params(ifp, rn->info);
+
+	route_table_finish(IF_OIFS(ifp));
 	route_table_finish(IF_OIFS_PARAMS(ifp));
 
 	XFREE(MTYPE_OSPF_IF_INFO, ifp->info);