From bd808b6a32eed0254614249795efc537a30baab0 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Apr 28 2020 09:39:47 +0000
Subject: import psmisc-23.1-4.el8


---

diff --git a/SOURCES/psmisc-23.1-no-nullptr-sanity-stalls-nfs.patch b/SOURCES/psmisc-23.1-no-nullptr-sanity-stalls-nfs.patch
new file mode 100644
index 0000000..947c611
--- /dev/null
+++ b/SOURCES/psmisc-23.1-no-nullptr-sanity-stalls-nfs.patch
@@ -0,0 +1,45 @@
+diff -up ./src/fuser.c.ori ./src/fuser.c
+--- ./src/fuser.c.ori	2017-03-25 00:17:53.169339912 +0100
++++ ./src/fuser.c	2019-08-23 11:58:55.268835489 +0200
+@@ -187,6 +187,9 @@ scan_procs(struct names *names_head, str
+ 	pid_t pid, my_pid;
+ 	uid_t uid;
+ 
++	if ( (ino_head == NULL) && (dev_head == NULL) )
++		return;
++
+ 	if ((topproc_dir = opendir("/proc")) == NULL) {
+ 		fprintf(stderr, _("Cannot open /proc directory: %s\n"),
+ 			strerror(errno));
+@@ -1860,6 +1863,10 @@ scan_knfsd(struct names *names_head, str
+ 	char *find_space;
+ 	struct stat st;
+ 
++	if ( (ino_head == NULL) && (dev_head == NULL) )
++		return;
++
++
+ 	if ((fp = fopen(KNFSD_EXPORTS, "r")) == NULL) {
+ #ifdef DEBUG
+ 		printf("Cannot open %s\n", KNFSD_EXPORTS);
+@@ -1906,6 +1913,10 @@ scan_mounts(struct names *names_head, st
+ 	char *find_space;
+ 	struct stat st;
+ 
++	if ( (ino_head == NULL) && (dev_head == NULL) )
++		return;
++
++
+ 	if ((fp = fopen(PROC_MOUNTS, "r")) == NULL) {
+ 		fprintf(stderr, "Cannot open %s\n", PROC_MOUNTS);
+ 		return;
+@@ -1949,6 +1960,9 @@ scan_swaps(struct names *names_head, str
+ 	char *find_space;
+ 	struct stat st;
+ 
++	if ( (ino_head == NULL) && (dev_head == NULL) )
++		return;
++
+ 	if ((fp = fopen(PROC_SWAPS, "r")) == NULL) {
+ 		/*fprintf(stderr, "Cannot open %s\n", PROC_SWAPS); */
+ 		return;
diff --git a/SPECS/psmisc.spec b/SPECS/psmisc.spec
index e27a950..b34cedb 100644
--- a/SPECS/psmisc.spec
+++ b/SPECS/psmisc.spec
@@ -2,7 +2,7 @@
 Summary: Utilities for managing processes on your system
 Name: psmisc
 Version: 23.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://gitlab.com/psmisc/psmisc
@@ -11,6 +11,7 @@ Source: https://sourceforge.net/projects/%{name}/files/%{name}/%{name}-%{version
 
 #The following has been reworked by upstream in a different way ... we'll see
 #Patch1: psmisc-22.13-fuser-silent.patch
+Patch2: psmisc-23.1-no-nullptr-sanity-stalls-nfs.patch
 
 BuildRequires: libselinux-devel
 BuildRequires: gettext
@@ -29,6 +30,7 @@ command shows the path of log files owned by a given process.
 
 %prep
 %setup -q
+%patch2 -p1
 
 %build
 %configure --prefix=%{_prefix} --enable-selinux
@@ -67,6 +69,10 @@ mv $RPM_BUILD_ROOT%{_bindir}/fuser $RPM_BUILD_ROOT%{_sbindir}
 
 
 %changelog
+* Wed Jun 12 2019 Jan Rybar <jrybar@redhat.com> - 23.1-4
+- backport of patch fixing fuser stalling NFS on non-existent file
+- Resolves: rhbz#1693785
+
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 23.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild