Merge pull request #13739 from donaldsharp/zebra_dplane_crash

zebra: Prevent crash because nl is NULL on shutdown

1 files changed, 8 insertions, 3 deletions

diff --git a/zebra/main.c b/zebra/main.c
index 81a3066445..bd4623be55 100644
--- a/zebra/main.c
+++ b/zebra/main.c
@@ -206,12 +206,17 @@ void zebra_finalize(struct event *dummy)
 
 	vrf_terminate();
 
+	/*
+	 * Stop dplane thread and finish any cleanup
+	 * This is before the zebra_ns_early_shutdown call
+	 * because sockets that the dplane depends on are closed
+	 * in those functions
+	 */
+	zebra_dplane_shutdown();
+
 	ns_walk_func(zebra_ns_early_shutdown, NULL, NULL);
 	zebra_ns_notify_close();
 
-	/* Stop dplane thread and finish any cleanup */
-	zebra_dplane_shutdown();
-
 	/* Final shutdown of ns resources */
 	ns_walk_func(zebra_ns_final_shutdown, NULL, NULL);