packages/conntrack-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!17 [sync] PR-15: Fix for memleak when parsing -j arg

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @yanan-rock 
Signed-off-by: @yanan-rock
This commit is contained in:
openeuler-ci-bot 2022-10-31 09:17:35 +00:00 committed by Gitee
commit 8e535a1dfc
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
backport-Fix-for-memleak-when-parsing-j-arg.patch Normal file
View File

@ -0,0 +1,32 @@
From 42cb292d6c9e8567db2e30e183b1bd31093700ad Mon Sep 17 00:00:00 2001
From: Phil Sutter <phil@nwl.cc>
Date: Fri, 25 Mar 2022 10:30:29 +0100
Subject: connntrack: Fix for memleak when parsing -j arg
Have to free the strings allocated by split_address_and_port().
Fixes: 29b390a212214 ("conntrack: Support IPv6 NAT")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Conflict:do_parse => main
Reference:https://git.netfilter.org/conntrack-tools/commit/?id=42cb292d6c9e8567db2e30e183b1bd31093700ad
---
src/conntrack.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/conntrack.c b/src/conntrack.c
index f65926b..415f551 100644
--- a/src/conntrack.c
+++ b/src/conntrack.c
@@ -2466,6 +2466,8 @@ int main(int argc, char *argv[])
nfct_set_nat_details(c, tmpl.ct, &ad,
port_str, family);
}
+ free(port_str);
+ free(nat_address);
}
break;
case 'w':
--
2.33.0

11
conntrack-tools.spec
View File

@ -1,12 +1,15 @@
Name: conntrack-tools
Version: 1.4.6
Release: 3
Release: 4
Summary: Userspace tools for interacting with the Connection Tracking System
License: GPLv2
URL: http://conntrack-tools.netfilter.org/
Source0: http://netfilter.org/projects/conntrack-tools/files/%{name}-%{version}.tar.bz2
Source1: conntrackd.service
Source2: conntrackd.conf
Patch0: backport-Fix-for-memleak-when-parsing-j-arg.patch
BuildRequires: libnfnetlink-devel >= 1.0.1 libnetfilter_conntrack-devel >= 1.0.8 libtirpc-devel
BuildRequires: libnetfilter_cttimeout-devel >= 1.0.0 libnetfilter_cthelper-devel >= 1.0.0 systemd
BuildRequires: libmnl-devel >= 1.0.3 libnetfilter_queue-devel >= 1.0.2 pkgconfig bison flex systemd-devel
@ -75,6 +78,12 @@ install -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/conntrackd/
%{_mandir}/man8/*
%changelog
* Mon Oct 31 2022 yanglu <yanglu72@h-partners.com> - 1.4.6-4
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:conntrack:Fix for memleak when parsing -j arg
* Thu Apr 28 2022 yanglu <yanglu72@h-partners.com> - 1.4.6-3
- Type:bugfix
- ID:NA