diff options
| author | Donald Sharp <sharpd@nvidia.com> | 2024-12-04 16:47:33 +0100 |
|---|---|---|
| committer | Donald Sharp <sharpd@nvidia.com> | 2024-12-04 16:49:49 +0100 |
| commit | 37b88191fb4736ff0a1e565fc22003d0ab853ea2 (patch) | |
| tree | 153e120c27de7751127a85c1f414963a98692cfe | |
| parent | Merge pull request #17518 from csiltala/fix-pimd-acl-memleak (diff) | |
| download | frr-37b88191fb4736ff0a1e565fc22003d0ab853ea2.tar.xz frr-37b88191fb4736ff0a1e565fc22003d0ab853ea2.zip | |
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 <sharpd@nvidia.com>
| -rw-r--r-- | pimd/pim_autorp.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pimd/pim_autorp.c b/pimd/pim_autorp.c index 3b46e7fb2..caed914a8 100644 --- 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__); |