summaryrefslogtreecommitdiff
path: root/zebra/main.c
diff options
context:
space:
mode:
authorDonald Sharp <donaldsharp72@gmail.com>2024-10-16 15:23:38 -0400
committerGitHub <noreply@github.com>2024-10-16 15:23:38 -0400
commitd8fc147d2c2d19a5a21bd6c8caf13d98100b55a8 (patch)
treec82e0b3c4828f9735b3b7a5111b78ff1884c736a /zebra/main.c
parenta8c5175284997f6ae28f1d9bf75ffaa4d4f521d5 (diff)
parentbcdc8249b97b6aab7b9609c1cdfdf83e10e1b9e7 (diff)
Merge pull request #17143 from FRRouting/mergify/bp/dev/10.2/pr-17020
zebra: fix heap-use-after free on ns shutdown (backport #17020)
Diffstat (limited to 'zebra/main.c')
-rw-r--r--zebra/main.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/zebra/main.c b/zebra/main.c
index 687da70cab..dd6249eff5 100644
--- a/zebra/main.c
+++ b/zebra/main.c
@@ -238,7 +238,7 @@ void zebra_finalize(struct event *dummy)
zebra_ns_notify_close();
/* Final shutdown of ns resources */
- ns_walk_func(zebra_ns_final_shutdown, NULL, NULL);
+ ns_walk_func(zebra_ns_kernel_shutdown, NULL, NULL);
zebra_rib_terminate();
zebra_router_terminate();
@@ -251,6 +251,8 @@ void zebra_finalize(struct event *dummy)
label_manager_terminate();
+ ns_walk_func(zebra_ns_final_shutdown, NULL, NULL);
+
ns_terminate();
frr_fini();
exit(0);