From cba24ce31669d3948d830c6e35d659514e198d93 Mon Sep 17 00:00:00 2001
From: Steve Dickson <steved@redhat.com>
Date: Tue, 16 Aug 2022 10:39:36 -0400
Subject: [PATCH] Fixed a double free in init_transport (bz 2115517)

Signed-off-by: Steve Dickson <steved@redhat.com>
Resolves: bz2115517
---
 rpcbind-1.2.6-double-free.patch | 15 +++++++++++++++
 rpcbind.spec                    |  8 ++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 rpcbind-1.2.6-double-free.patch

diff --git a/rpcbind-1.2.6-double-free.patch b/rpcbind-1.2.6-double-free.patch
new file mode 100644
index 0000000..dd33f04
--- /dev/null
+++ b/rpcbind-1.2.6-double-free.patch
@@ -0,0 +1,15 @@
+diff -up rpcbind-1.2.6/src/rpcbind.c.orig rpcbind-1.2.6/src/rpcbind.c
+--- rpcbind-1.2.6/src/rpcbind.c.orig	2022-08-16 10:16:03.196903368 -0400
++++ rpcbind-1.2.6/src/rpcbind.c	2022-08-16 10:16:38.595062481 -0400
+@@ -562,8 +562,10 @@ init_transport(struct netconfig *nconf)
+ 				syslog(LOG_ERR, "cannot bind %s on %s: %m",
+ 					(hosts[nhostsbak] == NULL) ? "*" :
+ 					hosts[nhostsbak], nconf->nc_netid);
+-				if (res != NULL)
++				if (res != NULL) {
+ 					freeaddrinfo(res);
++					res = NULL;
++				}
+ 				continue;
+ 			} else
+ 				checkbind++;
diff --git a/rpcbind.spec b/rpcbind.spec
index 7e1f541..b340e68 100644
--- a/rpcbind.spec
+++ b/rpcbind.spec
@@ -22,6 +22,11 @@ Requires(post): systemd policycoreutils
 Requires(preun): systemd
 Requires(postun): systemd coreutils
 
+#
+# RHEL9.1
+#
+Patch001: rpcbind-1.2.6-double-free.patch
+
 Patch100: rpcbind-0.2.3-systemd-envfile.patch
 Patch101: rpcbind-0.2.3-systemd-tmpfiles.patch
 Patch102: rpcbind-0.2.4-runstatdir.patch
@@ -125,6 +130,9 @@ fi
 %attr(0700, %{rpcbind_user_group}, %{rpcbind_user_group}) %dir %{rpcbind_state_dir}
 
 %changelog
+* Tue Aug 16 2022 Steve Dickson <steved@redhat.com> - 1.2.6-2
+- Fixed a double free in init_transport (bz 2115517)
+
 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.6-2
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688