rpms/psmisc
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Added nullptr sanity to scan fns to avoid useless work stalling NFS

Browse Source
This commit is contained in:
Jan Rybar 2019-02-19 16:44:32 +01:00
parent ac8d4bd436
commit 4a5d49090c
2 changed files with 51 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
psmisc-23.1-no-nullptr-sanity-stalls-nfs.patch Normal file
View File

@ -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-02-19 16:42:04.781433478 +0100
@@ -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;

7
psmisc.spec
View File

@ -2,7 +2,7 @@
Summary: Utilities for managing processes on your system
Name: psmisc
Version: 23.1
Release: 5%{?dist}
Release: 6%{?dist}
License: GPLv2+
URL: https://gitlab.com/psmisc/psmisc
@ -10,6 +10,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,9 @@ mv $RPM_BUILD_ROOT%{_bindir}/fuser $RPM_BUILD_ROOT%{_sbindir}
%changelog
* Mon Feb 18 2019 Jan Rybar <jrybar@redhat.com> - 23.1-6
- Added nullptr sanity to scan fns to avoid useless work stalling NFS
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 23.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild