rpms/pacemaker
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix a memory leak in the attribute daemon

Browse Source 
- Resolves: RHEL-40145
This commit is contained in:
Chris Lumens 2024-06-07 09:31:06 -04:00
parent 858d65b35c
commit f19afa96ca
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
011-attrd-memory-leak.patch Normal file
View File

@ -0,0 +1,31 @@
From 8dc0d9b43343919edf4f4011ceecfd6b6765b4a4 Mon Sep 17 00:00:00 2001
From: Ken Gaillot <kgaillot@redhat.com>
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

7
pacemaker.spec
View File

@ -244,7 +244,7 @@
Name: pacemaker Name: pacemaker
Summary: Scalable High-Availability cluster resource manager Summary: Scalable High-Availability cluster resource manager
Version: %{pcmkversion} Version: %{pcmkversion}
Release: %{pcmk_release}%{?dist} Release: %{pcmk_release}.1%{?dist}
%if %{defined _unitdir} %if %{defined _unitdir}
License: GPL-2.0-or-later AND LGPL-2.1-or-later License: GPL-2.0-or-later AND LGPL-2.1-or-later
%else %else
@ -275,6 +275,7 @@ Patch007: 007-option-metadata.patch
Patch008: 008-attrd-prep.patch Patch008: 008-attrd-prep.patch
Patch009: 009-attrd-cache-3.patch Patch009: 009-attrd-cache-3.patch
Patch010: 010-crm_attribute-free.patch Patch010: 010-crm_attribute-free.patch
Patch011: 011-attrd-memory-leak.patch
Requires: resource-agents Requires: resource-agents
Requires: %{pkgname_pcmk_libs}%{?_isa} = %{version}-%{release} Requires: %{pkgname_pcmk_libs}%{?_isa} = %{version}-%{release}
@ -1026,6 +1027,10 @@ exit 0
%license %{nagios_name}-%{nagios_hash}/COPYING %license %{nagios_name}-%{nagios_hash}/COPYING
%changelog %changelog
* Fri Jun 7 2024 Chris Lumens <clumens@redhat.com> - 2.1.7-5.1
- Fix a memory leak in the attribute daemon
- Resolves: RHEL-40145
* Thu Mar 21 2024 Chris Lumens <clumens@redhat.com> - 2.1.7-5 * Thu Mar 21 2024 Chris Lumens <clumens@redhat.com> - 2.1.7-5
- Fix upgrading to this package on multilib systems - Fix upgrading to this package on multilib systems
- Resolves: RHEL-29007 - Resolves: RHEL-29007