pimd: Prevent crash of pim when auto-rp's socket is not initialized

If the socket associated with the auto-rp fails to initialize then the memory for the auto-rp is just dropped on the floor. Additionally any type of attempt at using the feature will just cause pimd to crash, when the pointer is derefed. Since it is derefed all over the place without checking. Clearly if you cannot bind/use the socket let's allow continuation. Fixes: #17540 Signed-off-by: Donald Sharp <[email protected]>
FRRouting · Dec 4, 2024 · 37b8819 · 37b8819
1 parent 267dc19
commit 37b8819
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/pimd/pim_autorp.c b/pimd/pim_autorp.c
@@ -1508,12 +1508,14 @@ void pim_autorp_init(struct pim_instance *pim)
 	autorp->discovery_holdtime = DEFAULT_AUTORP_DISCOVERY_HOLDTIME;
 	cand_addrsel_clear(&(autorp->mapping_agent_addrsel));
 
+	pim->autorp = autorp;
+
 	if (!pim_autorp_socket_enable(autorp)) {
-		zlog_warn("%s: AutoRP failed to initialize", __func__);
+		zlog_warn("%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__);