From f3afefee11dc80cb4c881e36f353b3e426f19ee0 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 27 Sep 2022 16:26:24 -0400
Subject: [PATCH] import rpcbind-1.2.5-10.el8

---
 SOURCES/rpcbind-1.2.5-double-free.patch  | 15 +++++++++++++++
 SOURCES/rpcbind-1.2.5-network_init.patch | 12 ++++++++++++
 SPECS/rpcbind.spec                       | 20 +++++++++++++++++++-
 3 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 SOURCES/rpcbind-1.2.5-double-free.patch
 create mode 100644 SOURCES/rpcbind-1.2.5-network_init.patch

diff --git a/SOURCES/rpcbind-1.2.5-double-free.patch b/SOURCES/rpcbind-1.2.5-double-free.patch
new file mode 100644
index 0000000..1f42092
--- /dev/null
+++ b/SOURCES/rpcbind-1.2.5-double-free.patch
@@ -0,0 +1,15 @@
+diff -up rpcbind-1.2.5/src/rpcbind.c.orig rpcbind-1.2.5/src/rpcbind.c
+--- rpcbind-1.2.5/src/rpcbind.c.orig	2022-08-04 15:56:21.398070276 -0400
++++ rpcbind-1.2.5/src/rpcbind.c	2022-08-04 15:56:57.255699229 -0400
+@@ -563,8 +563,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/SOURCES/rpcbind-1.2.5-network_init.patch b/SOURCES/rpcbind-1.2.5-network_init.patch
new file mode 100644
index 0000000..bb747ac
--- /dev/null
+++ b/SOURCES/rpcbind-1.2.5-network_init.patch
@@ -0,0 +1,12 @@
+diff -up rpcbind-1.2.5/src/util.c.orig rpcbind-1.2.5/src/util.c
+--- rpcbind-1.2.5/src/util.c.orig	2022-05-31 08:47:51.624211564 -0400
++++ rpcbind-1.2.5/src/util.c	2022-05-31 08:49:54.577060858 -0400
+@@ -287,7 +287,7 @@ network_init()
+ 	int s;
+ #endif
+ 	int ecode;
+-	struct addrinfo hints, *res;
++	struct addrinfo hints, *res = NULL;
+ 
+ 	memset(&hints, 0, sizeof hints);
+ 	hints.ai_family = AF_INET;
diff --git a/SPECS/rpcbind.spec b/SPECS/rpcbind.spec
index 4064794..f4aa243 100644
--- a/SPECS/rpcbind.spec
+++ b/SPECS/rpcbind.spec
@@ -4,7 +4,7 @@
 
 Name:           rpcbind
 Version:        1.2.5
-Release:        8%{?dist}
+Release:        10%{?dist}
 Summary:        Universal Addresses to RPC Program Number Mapper
 Group:          System Environment/Daemons
 License:        BSD
@@ -37,6 +37,12 @@ Patch002: rpcbind-1.2.5-covscan-resource-leaks.patch
 #
 Patch003: rpcbind-1.2.5-dowgrade-priority-callit.patch
 
+#
+# RHEL 8.7
+#
+Patch004: rpcbind-1.2.5-network_init.patch
+Patch005: rpcbind-1.2.5-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
@@ -63,6 +69,12 @@ RPC calls on a server on that machine.
 # 1897122 - rpcbind : downgrade priority for non-libwrap CALLIT logging
 %patch003 -p1
 
+# 1959003 -  network_init: initialize response addrinfo list to NULL
+%patch004 -p1
+
+# 2115209 - rpcbind: free(): double free detected in tcache 2 
+%patch005 -p1
+
 %patch100 -p1
 %patch101 -p1
 %patch102 -p1
@@ -157,6 +169,12 @@ fi
 %attr(0700, %{rpcbind_user_group}, %{rpcbind_user_group}) %dir %{rpcbind_state_dir}
 
 %changelog
+* Thu Aug  4 2022 Steve Dickson <steved@redhat.com> - 1.2.5-10
+- rpcbind: fix double free in init_transport (bz 2115209)
+
+* Tue May 31 2022 Steve Dickson <steved@redhat.com> - 1.2.5-9
+- network_init: initialize response addrinfo list to NULL (bz 1959003)
+
 * Thu Nov 19 2020 Steve Dickson <steved@redhat.com> - 1.2.5-8
 - security: dowgrade priority for non-libwrap CALLIT logging (bz 1897122)