New version 10.2.1

This commit is contained in:
Michal Ruprich
2025-01-31 09:00:29 +01:00
parent fd2546a2e0
commit a6947d365d
4 changed files with 7 additions and 45 deletions

1
.gitignore vendored
View File

@@ -22,3 +22,4 @@
/frr-10.0.1.tar.gz /frr-10.0.1.tar.gz
/frr-10.1.tar.gz /frr-10.1.tar.gz
/frr-10.2.tar.gz /frr-10.2.tar.gz
/frr-10.2.1.tar.gz

View File

@@ -1,41 +0,0 @@
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__);

View File

@@ -8,8 +8,8 @@
%bcond selinux 1 %bcond selinux 1
Name: frr Name: frr
Version: 10.2 Version: 10.2.1
Release: 4%{?dist} Release: 1%{?dist}
Summary: Routing daemon Summary: Routing daemon
License: GPL-2.0-or-later AND ISC AND LGPL-2.0-or-later AND BSD-2-Clause AND BSD-3-Clause AND (GPL-2.0-or-later OR ISC) AND MIT License: GPL-2.0-or-later AND ISC AND LGPL-2.0-or-later AND BSD-2-Clause AND BSD-3-Clause AND (GPL-2.0-or-later OR ISC) AND MIT
URL: http://www.frrouting.org URL: http://www.frrouting.org
@@ -26,7 +26,6 @@ Patch0002: 0002-enable-openssl.patch
Patch0003: 0003-disable-eigrp-crypto.patch Patch0003: 0003-disable-eigrp-crypto.patch
Patch0004: 0004-fips-mode.patch Patch0004: 0004-fips-mode.patch
Patch0005: 0005-remove-grpc-test.patch Patch0005: 0005-remove-grpc-test.patch
Patch0006: 0006-autorp-segfault.patch
# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
%if %{undefined fc40} && %{undefined fc41} %if %{undefined fc40} && %{undefined fc41}
@@ -284,6 +283,9 @@ rm tests/lib/*grpc*
%endif %endif
%changelog %changelog
* Thu Jan 30 2025 Michal Ruprich <mruprich@redhat.com> - 10.2.1-1
- New version 10.2.1
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 10.2-4 * Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 10.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

View File

@@ -1,2 +1,2 @@
SHA512 (frr-10.2.tar.gz) = 40a0e1f1a7f2cc137aac6e838b2f865b93fdc1cd6bd0f6c5b15b4507cbff87cb60092682e45aca68633cb053fb2ce663386edb78e5d3c5f890f4666e871ab8c5 SHA512 (frr-10.2.1.tar.gz) = c49b0afb7b9a923b65bdcc4d4a6868b08eaecc4620d251f18648e0a5d65fb28fef4af382e4d3a74c27f090eaeab02a649672845c29524d7339c1a1a1e23e14c2
SHA512 (remove-babeld-ldpd.sh) = a5bf67a3722cb20d43cef1dac28f839db68df73a1b7d34d8438e4f9366da3b67d85c1f44281f93434e8dd8ebcb2d3dc258b77eaa5627475b7395d207f020839d SHA512 (remove-babeld-ldpd.sh) = a5bf67a3722cb20d43cef1dac28f839db68df73a1b7d34d8438e4f9366da3b67d85c1f44281f93434e8dd8ebcb2d3dc258b77eaa5627475b7395d207f020839d