From b9eecb3081a3bc9d727ae7e5c3a91514a6bddcef Mon Sep 17 00:00:00 2001 From: yangl777 Date: Mon, 31 Oct 2022 07:37:10 +0000 Subject: [PATCH] Fix for memleak when parsing -j arg (cherry picked from commit 8d8c474bea8b5bd03a8e88960a304d1c3c9067b1) --- ...t-Fix-for-memleak-when-parsing-j-arg.patch | 32 +++++++++++++++++++ conntrack-tools.spec | 11 ++++++- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 backport-Fix-for-memleak-when-parsing-j-arg.patch diff --git a/backport-Fix-for-memleak-when-parsing-j-arg.patch b/backport-Fix-for-memleak-when-parsing-j-arg.patch new file mode 100644 index 0000000..60d13d3 --- /dev/null +++ b/backport-Fix-for-memleak-when-parsing-j-arg.patch @@ -0,0 +1,32 @@ +From 42cb292d6c9e8567db2e30e183b1bd31093700ad Mon Sep 17 00:00:00 2001 +From: Phil Sutter +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 + +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 + diff --git a/conntrack-tools.spec b/conntrack-tools.spec index 4b639e4..e8cf717 100644 --- a/conntrack-tools.spec +++ b/conntrack-tools.spec @@ -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 - 1.4.6-4 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:conntrack:Fix for memleak when parsing -j arg + * Thu Apr 28 2022 yanglu - 1.4.6-3 - Type:bugfix - ID:NA -- Gitee