mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-08-05 08:23:56 +00:00
zebra: Ensure memory is not freed that dplane depends on in shutdown
Zebra has a shutdown setup where it asks the dplane to shutdown but can still be processing data. This is especially true if something the dplane is listening on receives data that will be processed by the main dplane thread from netlink. When zebra_finalize is called it is possible that a bit of data comes in before the zebra_dplane_shutdown() function is called and the memory freed in ns_walk_func() causes the main dplane event to crash when it cannot find the ns data anymore. Reverse the order, stop the zebra dplane pthread and then free the memory associated with the namespaces. Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
parent
507621139b
commit
0e61463a8e
@ -221,12 +221,12 @@ void zebra_finalize(struct thread *dummy)
|
||||
{
|
||||
zlog_info("Zebra final shutdown");
|
||||
|
||||
/* Final shutdown of ns resources */
|
||||
ns_walk_func(zebra_ns_final_shutdown, NULL, NULL);
|
||||
|
||||
/* Stop dplane thread and finish any cleanup */
|
||||
zebra_dplane_shutdown();
|
||||
|
||||
/* Final shutdown of ns resources */
|
||||
ns_walk_func(zebra_ns_final_shutdown, NULL, NULL);
|
||||
|
||||
zebra_router_terminate();
|
||||
|
||||
ns_terminate();
|
||||
|
Loading…
Reference in New Issue
Block a user