Resolves: rhbz#2329643 - upgrading frr to 10.2 causes pimd crashes
This commit is contained in:
41
0006-autorp-segfault.patch
Normal file
41
0006-autorp-segfault.patch
Normal file
@@ -0,0 +1,41 @@
|
||||
From 37b88191fb4736ff0a1e565fc22003d0ab853ea2 Mon Sep 17 00:00:00 2001
|
||||
From: Donald Sharp <sharpd@nvidia.com>
|
||||
Date: Wed, 4 Dec 2024 10:47:33 -0500
|
||||
Subject: [PATCH] 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>
|
||||
---
|
||||
pimd/pim_autorp.c | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/pimd/pim_autorp.c b/pimd/pim_autorp.c
|
||||
index 3fb10f4..91ed005 100644
|
||||
--- a/pimd/pim_autorp.c
|
||||
+++ b/pimd/pim_autorp.c
|
||||
@@ -1014,12 +1014,14 @@ void pim_autorp_init(struct pim_instance *pim)
|
||||
autorp->announce_interval = DEFAULT_ANNOUNCE_INTERVAL;
|
||||
autorp->announce_holdtime = DEFAULT_ANNOUNCE_HOLDTIME;
|
||||
|
||||
+ pim->autorp = autorp;
|
||||
+
|
||||
if (!pim_autorp_socket_enable(autorp)) {
|
||||
- zlog_err("%s: AutoRP failed to initialize", __func__);
|
||||
+ zlog_err("%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__);
|
||||
|
||||
Reference in New Issue
Block a user