From d6440b5373fb43f732c89bce7002ee0ed62a6a9b Mon Sep 17 00:00:00 2001 From: lihaoxiang Date: Wed, 19 Oct 2022 04:28:28 -0400 Subject: [PATCH] sanlock:fix memory leak of lockspace renewal history (cherry picked from commit 0e9c1785d2561d76876f718185be86b5d528698e) --- ...ry-leak-of-lockspace-renewal_history.patch | 30 +++++++++++++++++++ sanlock.spec | 7 ++++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 0001-sanlock-fix-memory-leak-of-lockspace-renewal_history.patch diff --git a/0001-sanlock-fix-memory-leak-of-lockspace-renewal_history.patch b/0001-sanlock-fix-memory-leak-of-lockspace-renewal_history.patch new file mode 100644 index 0000000..98afb9a --- /dev/null +++ b/0001-sanlock-fix-memory-leak-of-lockspace-renewal_history.patch @@ -0,0 +1,30 @@ +From 1fa8d43007b31115342002ac675c905d9f18fbd9 Mon Sep 17 00:00:00 2001 +From: David Teigland +Date: Thu, 3 Mar 2022 09:39:52 -0600 +Subject: [PATCH] sanlock: fix memory leak of lockspace renewal_history + +Leak was in original commit for "sanlock: renewal history" +6313c709722b3ba63234a75d1651a160bf1728ee. + +With the default renewal history size, each lockspace that +was created would leak about 4kb of memory. +--- + src/lockspace.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/lockspace.c b/src/lockspace.c +index 2ebc247..d23dccd 100644 +--- a/src/lockspace.c ++++ b/src/lockspace.c +@@ -939,6 +939,8 @@ static void free_sp(struct space *sp) + { + if (sp->lease_status.renewal_read_buf) + free(sp->lease_status.renewal_read_buf); ++ if (sp->renewal_history) ++ free(sp->renewal_history); + free(sp); + } + +-- +1.8.3.1 + diff --git a/sanlock.spec b/sanlock.spec index f45fe58..e02cd5d 100644 --- a/sanlock.spec +++ b/sanlock.spec @@ -1,11 +1,13 @@ Name: sanlock Version: 3.8.4 -Release: 1 +Release: 2 Summary: A shared storage lock manager License: GPLv2 and GPLv2+ and LGPLv2+ URL: https://pagure.io/sanlock/ Source0: https://releases.pagure.org/sanlock/%{name}-%{version}.tar.gz +Patch1: 0001-sanlock-fix-memory-leak-of-lockspace-renewal_history.patch + BuildRequires: libblkid-devel libaio-devel python3 python3-devel systemd-units gcc Requires(pre): shadow Requires(post): systemd-units systemd-sysv @@ -150,6 +152,9 @@ getent passwd sanlock > /dev/null || /usr/sbin/useradd \ %changelog +* Wed Oct 19 2022 lihaoxiang - 3.8.4-2 +- sanlock:fix memory leak of lockspace renewal history + * Tue Nov 23 2021 yanglongkang - 3.8.4-1 - update to 3.8.4