ospfd: fix dangling pointer when exiting from the helper mode

When exiting from the helper mode for a given router after an
unsuccessful graceful restart, removing the neighborship to that
router straight away leads to a dangling pointer in the associated
interface, which inevitably leads to a crash. To solve this
problem, schedule the removal of the neighbor instead of removing
it immediately.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>

diff --git a/ospfd/ospf_gr_helper.c b/ospfd/ospf_gr_helper.c
index 10c5020cd18c31660fe26e935c4b971b644ee45e..3a130f87fe1f6a659cd62a2eda00b4ec66160910 100644 (file)
--- a/ospfd/ospf_gr_helper.c
+++ b/ospfd/ospf_gr_helper.c
@@ -721,7 +721,7 @@ void ospf_gr_helper_exit(struct ospf_neighbor *nbr,
                        zlog_debug(
                                "%s, Failed GR exit, so bringing down the neighbour",
                                __func__);
-               OSPF_NSM_EVENT_EXECUTE(nbr, NSM_KillNbr);
+               OSPF_NSM_EVENT_SCHEDULE(nbr, NSM_KillNbr);
        }
 
        /*Recalculate the DR for the network segment */