diff options
| author | Rafael Zalamena <rzalamena@opensourcerouting.org> | 2024-09-29 17:31:06 -0300 |
|---|---|---|
| committer | Rafael Zalamena <rzalamena@opensourcerouting.org> | 2024-11-13 12:05:35 -0300 |
| commit | 2add05a634961637314c51dba25da2323d41c600 (patch) | |
| tree | bfb1f9d3578baff19989bbb20e974f432f07709c | |
| parent | 2941f579f76334b4e3531c9f5b3d442525dbf648 (diff) | |
pimd: prevent invalid memory access
Signalize termination to functions so they can avoid accessing pointers
that might be no longer available.
Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
| -rw-r--r-- | pimd/pim_instance.c | 2 | ||||
| -rw-r--r-- | pimd/pim_instance.h | 2 | ||||
| -rw-r--r-- | pimd/pim_tib.c | 7 |
3 files changed, 11 insertions, 0 deletions
diff --git a/pimd/pim_instance.c b/pimd/pim_instance.c index f7c5ea3bcf..e18ae97d6f 100644 --- a/pimd/pim_instance.c +++ b/pimd/pim_instance.c @@ -26,6 +26,8 @@ static void pim_instance_terminate(struct pim_instance *pim) { + pim->stopping = true; + pim_vxlan_exit(pim); if (pim->ssm_info) { diff --git a/pimd/pim_instance.h b/pimd/pim_instance.h index 387926c907..1b7815d86c 100644 --- a/pimd/pim_instance.h +++ b/pimd/pim_instance.h @@ -192,6 +192,8 @@ struct pim_instance { uint64_t gm_rx_drop_sys; + bool stopping; + #if PIM_IPV == 6 struct { /** Embedded RP enable state. */ diff --git a/pimd/pim_tib.c b/pimd/pim_tib.c index 12ae0d6246..e21793b8ca 100644 --- a/pimd/pim_tib.c +++ b/pimd/pim_tib.c @@ -181,7 +181,14 @@ void tib_sg_gm_prune(struct pim_instance *pim, pim_sgaddr sg, Making the call to pim_channel_del_oif and ignoring the return code fixes the issue without ill effect, similar to pim_forward_stop below. + + Also on shutdown when the PIM upstream is removed the channel removal + may have already happened, so just return here instead of trying to + access an invalid pointer. */ + if (pim->stopping) + return; + result = pim_channel_del_oif(*oilp, oif, PIM_OIF_FLAG_PROTO_GM, __func__); if (result) { |