From 4c42d92235b1fc8ba2923aec7592b7bd12ea0b49 Mon Sep 17 00:00:00 2001 From: Pavel Reichl Date: Thu, 12 Sep 2024 13:16:52 +0200 Subject: [PATCH] Fix memory leak Resolves: RHEL-50914 Signed-off-by: Pavel Reichl --- ...a-master-quotaio_xfs-Fix-memory-leak.patch | 30 +++++++++++++++++++ quota.spec | 7 ++++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 quota-master-quotaio_xfs-Fix-memory-leak.patch diff --git a/quota-master-quotaio_xfs-Fix-memory-leak.patch b/quota-master-quotaio_xfs-Fix-memory-leak.patch new file mode 100644 index 0000000..98abac5 --- /dev/null +++ b/quota-master-quotaio_xfs-Fix-memory-leak.patch @@ -0,0 +1,30 @@ +From c59b85805ee64c7ee2937b91533eb96f56d87738 Mon Sep 17 00:00:00 2001 +From: Pavel Reichl +Date: Tue, 30 Jul 2024 00:18:13 +0200 +Subject: [PATCH] quotaio_xfs: Fix memory leak + +Error: RESOURCE_LEAK (CWE-772): +quota-4.09/quotaio_xfs.c:162:2: alloc_fn: Storage is returned from allocation function "get_empty_dquot". +quota-4.09/quotaio_xfs.c:162:2: var_assign: Assigning: "dquot" = storage returned from "get_empty_dquot()". +quota-4.09/quotaio_xfs.c:180:4: leaked_storage: Variable "dquot" going out of scope leaks the storage it points to. + +Signed-off-by: Pavel Reichl +--- + quotaio_xfs.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/quotaio_xfs.c b/quotaio_xfs.c +index 2df27b5..5446bc5 100644 +--- a/quotaio_xfs.c ++++ b/quotaio_xfs.c +@@ -174,6 +174,7 @@ static struct dquot *xfs_read_dquot(struct quota_handle *h, qid_t id) + * zeros. Otherwise return failure. + */ + if (errno != ENOENT) { ++ free(dquot); + return NULL; + } + } +-- +2.46.0 + diff --git a/quota.spec b/quota.spec index 41bad1c..63531d3 100644 --- a/quota.spec +++ b/quota.spec @@ -13,7 +13,7 @@ Name: quota Epoch: 1 Version: 4.09 -Release: 2%{?dist} +Release: 3%{?dist} Summary: System administration tools for monitoring users' disk usage # quota_nld.c, quotaio_xfs.h: GPLv2 # bylabel.c copied from util-linux: GPLv2+ @@ -64,6 +64,7 @@ Patch3: quota-4.10-Add-quotactl_fd-support.patch Patch4: quota-4.10-Enable-support-for-tmpfs-quotas.patch Patch5: quota-4.10-quotaio_xfs-Fix-error-handling-in-xfs_read_dquot.patch Patch6: quota-4.10-quotaio_xfs-Fix-quota-tools-on-XFS.patch +Patch7: quota-master-quotaio_xfs-Fix-memory-leak.patch BuildRequires: autoconf BuildRequires: automake @@ -341,6 +342,10 @@ make check %changelog +* Thu Sep 12 2024 Pavel Reichl - 1:4.09-3 +- Fix memory leak +- Related: RHEL-50914 + * Fri Jul 26 2024 Pavel Reichl - 1:4.09-2 - Fix regression - Related: RHEL-50644