diff --git a/backport-Fix-memory-leak-when-using-dhcp-optsfile-with-DHCPv6.patch b/backport-Fix-memory-leak-when-using-dhcp-optsfile-with-DHCPv6.patch new file mode 100644 index 0000000000000000000000000000000000000000..a18c50a67e11be0c9647ad174115a79025944a6d --- /dev/null +++ b/backport-Fix-memory-leak-when-using-dhcp-optsfile-with-DHCPv6.patch @@ -0,0 +1,48 @@ +From d16b995756dc079b1fdc2e63665793979f766a26 Mon Sep 17 00:00:00 2001 +From: renmingshuai +Date: Sat, 30 Sep 2023 23:31:08 +0100 +Subject: [PATCH] Fix memory leak when using --dhcp-optsfile with DHCPv6 + options. + +Conflict:NA +Reference:https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=d16b995756dc079b1fdc2e63665793979f766a26 +--- + src/option.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/src/option.c b/src/option.c +index 8322725..286f06b 100644 +--- a/src/option.c ++++ b/src/option.c +@@ -5734,11 +5734,11 @@ static void clear_dynamic_conf(void) + } + } + +-static void clear_dynamic_opt(void) ++static void clear_dhcp_opt(struct dhcp_opt **dhcp_opts) + { + struct dhcp_opt *opts, *cp, **up; + +- for (up = &daemon->dhcp_opts, opts = daemon->dhcp_opts; opts; opts = cp) ++ for (up = dhcp_opts, opts = *dhcp_opts; opts; opts = cp) + { + cp = opts->next; + +@@ -5752,6 +5752,14 @@ static void clear_dynamic_opt(void) + } + } + ++static void clear_dynamic_opt(void) ++{ ++ clear_dhcp_opt(&daemon->dhcp_opts); ++#ifdef HAVE_DHCP6 ++ clear_dhcp_opt(&daemon->dhcp_opts6); ++#endif ++} ++ + void reread_dhcp(void) + { + struct hostsfile *hf; +-- +2.23.0 + diff --git a/dnsmasq.spec b/dnsmasq.spec index 1d758ad704d4193bde1bbfccc49b2cee26b8d4a1..15bca73de28b8795280fea211ddb6d90562cd368 100644 --- a/dnsmasq.spec +++ b/dnsmasq.spec @@ -1,6 +1,6 @@ Name: dnsmasq Version: 2.89 -Release: 1 +Release: 2 Summary: Dnsmasq provides network infrastructure for small networks License: GPLv2 or GPLv3 URL: http://www.thekelleys.org.uk/dnsmasq/ @@ -14,6 +14,7 @@ Patch3: backport-dnsmasq-2.78-fips.patch Patch4: backport-CVE-2023-28450-Set-the-default-maximum-DNS-UDP-packet.patch Patch5: bugfix-allow-binding-mac-with-ipv6.patch Patch6: bugfix-deal-with-CONFRIM-when-binding-mac-with-ipv6.patch +Patch7: backport-Fix-memory-leak-when-using-dhcp-optsfile-with-DHCPv6.patch BuildRequires: gcc BuildRequires: dbus-devel pkgconfig libidn2-devel nettle-devel systemd @@ -103,6 +104,12 @@ install -Dpm644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysusersdir}/dnsmasq.conf %{_mandir}/man8/dnsmasq* %changelog +* Wed Nov 22 2023 renmingshuai - 2.89-2 +- Type:bugfix +- Id:NA +- SUG:NA +- DESC:Fix memory leak when using --dhcp-optsfile with DHCPv6 options + * Tue Aug 8 2023 renmingshuai - 2.89-1 - Type:requirement - Id:NA