From 1969e05975ab34c568b5eac61f57cb44d35d21fb Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 13 Aug 2024 14:02:40 +0000 Subject: [PATCH] import CS pacemaker-2.1.7-5.1.el8 --- SOURCES/011-attrd-memory-leak.patch | 31 +++++++++++++++++++++++++++++ SPECS/pacemaker.spec | 7 ++++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 SOURCES/011-attrd-memory-leak.patch diff --git a/SOURCES/011-attrd-memory-leak.patch b/SOURCES/011-attrd-memory-leak.patch new file mode 100644 index 0000000..8035f04 --- /dev/null +++ b/SOURCES/011-attrd-memory-leak.patch @@ -0,0 +1,31 @@ +From 8dc0d9b43343919edf4f4011ceecfd6b6765b4a4 Mon Sep 17 00:00:00 2001 +From: Ken Gaillot +Date: Wed, 8 May 2024 11:18:50 -0500 +Subject: [PATCH] Low: libcib: avoid memory leak in async calls + +Never in a release +--- + lib/cib/cib_native.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/lib/cib/cib_native.c b/lib/cib/cib_native.c +index 0e502155bc..b014223112 100644 +--- a/lib/cib/cib_native.c ++++ b/lib/cib/cib_native.c +@@ -94,9 +94,10 @@ cib_native_perform_op_delegate(cib_t *cib, const char *op, const char *host, + + if (!(call_options & cib_sync_call)) { + crm_trace("Async call, returning %d", cib->call_id); +- CRM_CHECK(cib->call_id != 0, return -ENOMSG); +- free_xml(op_reply); +- return cib->call_id; ++ CRM_CHECK(cib->call_id != 0, ++ rc = -ENOMSG; goto done); ++ rc = cib->call_id; ++ goto done; + } + + rc = pcmk_ok; +-- +2.41.0 + diff --git a/SPECS/pacemaker.spec b/SPECS/pacemaker.spec index 7023146..bec9c46 100644 --- a/SPECS/pacemaker.spec +++ b/SPECS/pacemaker.spec @@ -244,7 +244,7 @@ Name: pacemaker Summary: Scalable High-Availability cluster resource manager Version: %{pcmkversion} -Release: %{pcmk_release}%{?dist} +Release: %{pcmk_release}.1%{?dist} %if %{defined _unitdir} License: GPL-2.0-or-later AND LGPL-2.1-or-later %else @@ -275,6 +275,7 @@ Patch007: 007-option-metadata.patch Patch008: 008-attrd-prep.patch Patch009: 009-attrd-cache-3.patch Patch010: 010-crm_attribute-free.patch +Patch011: 011-attrd-memory-leak.patch Requires: resource-agents Requires: %{pkgname_pcmk_libs}%{?_isa} = %{version}-%{release} @@ -1026,6 +1027,10 @@ exit 0 %license %{nagios_name}-%{nagios_hash}/COPYING %changelog +* Fri Jun 7 2024 Chris Lumens - 2.1.7-5.1 +- Fix a memory leak in the attribute daemon +- Resolves: RHEL-40145 + * Thu Mar 21 2024 Chris Lumens - 2.1.7-5 - Fix upgrading to this package on multilib systems - Resolves: RHEL-29007