Merge pull request #16309 from louis-6wind/fix-pim-crash

pimd: fix crash on non-existent interface
FRRouting · Jul 22, 2024 · 703beba · 703beba
2 parents f2d5bf7 + 6952bea
commit 703beba
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;
 	}