Merge pull request #16435 from FRRouting/mergify/bp/stable/9.1/pr-16309

pimd: fix crash on non-existent interface (backport #16309)
FRRouting · Jul 23, 2024 · 4d7932a · 4d7932a
2 parents 6b77433 + b51fe77
commit 4d7932a
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/pimd/pim_nb_config.c b/pimd/pim_nb_config.c
@@ -1504,11 +1504,19 @@ int routing_control_plane_protocols_control_plane_protocol_pim_address_family_re
  */
 int lib_interface_pim_address_family_create(struct nb_cb_create_args *args)
 {
+	struct interface *ifp;
+
 	switch (args->event) {
 	case NB_EV_VALIDATE:
-	case NB_EV_PREPARE:
-	case NB_EV_ABORT:
 	case NB_EV_APPLY:
+	case NB_EV_ABORT:
+		break;
+	case NB_EV_PREPARE:
+		ifp = nb_running_get_entry(args->dnode, NULL, true);
+		if (ifp->info)
+			return NB_OK;
+
+		pim_if_new(ifp, false, false, false, false);
 		break;
 	}