Merge pull request #17584 from Jafaral/fix-autorp-crash

pimd: Prevent crash of pim when auto-rp's socket is not initialized (backport #17578)
FRRouting · Dec 5, 2024 · dcccad4 · dcccad4
2 parents 6d7214e + 2faba14
commit dcccad4
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/pimd/pim_autorp.c b/pimd/pim_autorp.c
@@ -1014,12 +1014,13 @@ void pim_autorp_init(struct pim_instance *pim)
 	autorp->announce_interval = DEFAULT_ANNOUNCE_INTERVAL;
 	autorp->announce_holdtime = DEFAULT_ANNOUNCE_HOLDTIME;
 
+	pim->autorp = autorp;
+
 	if (!pim_autorp_socket_enable(autorp)) {
-		zlog_err("%s: AutoRP failed to initialize", __func__);
+		zlog_err("%s: AutoRP failed to initialize, feature will not work correctly", __func__);
 		return;
 	}
 
-	pim->autorp = autorp;
 	if (PIM_DEBUG_AUTORP)
 		zlog_debug("%s: AutoRP Initialized", __func__);