rpms/keepalived
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Auto sync2gitlab import of keepalived-2.1.5-9.el8.src.rpm

Browse Source
This commit is contained in:
CentOS Sources 2022-07-27 04:10:06 +00:00
parent ffdd4d4f3a
commit c8edcee3cd
2 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
bz2054249-fix-unweighted-track-scripts.patch Normal file
View File

@ -0,0 +1,41 @@
From d93b2051641ebfc4c5dcdc405ed0f26b9bcaa65a Mon Sep 17 00:00:00 2001
From: Quentin Armitage <quentin@armitage.org.uk>
Date: Sat, 25 Jul 2020 10:13:32 +0100
Subject: [PATCH] vrrp: Don't remove unweighted track scripts from sync group
members
Commit 3390697 - "vrrp: rewrote framework using list_head_t design"
cleared the track_script list for any vrrp instance that was in a
sync group. This was due to the old list structure allocating memory
which had to be freed if the list was empty, but that is no longer
the case with list_head.
Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
---
keepalived/vrrp/vrrp.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/keepalived/vrrp/vrrp.c b/keepalived/vrrp/vrrp.c
index c8967eef..c7ded6b4 100644
--- a/keepalived/vrrp/vrrp.c
+++ b/keepalived/vrrp/vrrp.c
@@ -3406,7 +3406,7 @@ vrrp_complete_instance(vrrp_t * vrrp)
free_track_if_list(&vrrp->track_ifp);
/* Ignore any weighted script */
- list_for_each_entry_safe(sc, sc_tmp, &vrrp->track_script,e_list) {
+ list_for_each_entry_safe(sc, sc_tmp, &vrrp->track_script, e_list) {
if (sc->weight) {
report_config_error(CONFIG_GENERAL_ERROR, "(%s) ignoring "
"tracked script %s with weights due to %s"
@@ -3417,7 +3417,6 @@ vrrp_complete_instance(vrrp_t * vrrp)
free_track_script(sc);
}
}
- free_track_script_list(&vrrp->track_script);
/* Set tracking files to unweighted if weight not explicitly set, otherwise ignore */
list_for_each_entry_safe(tfl, tfl_tmp, &vrrp->track_file, e_list) {
--
2.33.1

7
keepalived.spec
View File

@ -10,7 +10,7 @@
Name: keepalived
Summary: High Availability monitor built upon LVS, VRRP and service pollers
Version: 2.1.5
Release: 8%{?dist}
Release: 9%{?dist}
License: GPLv2+
URL: http://www.keepalived.org/
Group: System Environment/Daemons
@ -21,6 +21,7 @@ Source1: keepalived.service
Patch1: bz1977716-revert-explicit-set-LOG_USER-facility.patch
Patch2: bz1977716-use-LOG_DAEMON-facility-by-default.patch
Patch3: bz2028350-fix-dbus-policy-restrictions.patch
Patch4: bz2054249-fix-unweighted-track-scripts.patch
Requires(post): systemd
Requires(preun): systemd
@ -59,6 +60,7 @@ infrastructures.
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%build
%configure \
@ -109,6 +111,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived
%{_mandir}/man8/keepalived.8*
%changelog
* Thu Jul 21 2022 Ryan O'Hara <rohara@redhat.com> - 2.1.5-9
- Fix removal of unweighted track scripts from sync group (#2054249)
* Tue Jan 18 2022 Ryan O'Hara <rohara@redhat.com> - 2.1.5-8
- Fix DBus policy restrictions (#2028350, CVE-2021-44225)