diff --git a/nfs-utils-2.5.4-rpcidmapd-nfsopen-failure.patch b/nfs-utils-2.5.4-rpcidmapd-nfsopen-failure.patch new file mode 100644 index 0000000..3f86e5e --- /dev/null +++ b/nfs-utils-2.5.4-rpcidmapd-nfsopen-failure.patch @@ -0,0 +1,31 @@ +commit fdc5081a8f48dd161ea94fff11bf0afd8d901747 +Author: Salvatore Bonaccorso +Date: Fri Sep 20 12:30:07 2024 -0400 + + rpc.idmapd: nfsopen() failures should not be fatal + + dirscancb() loops over all clnt* subdirectories of /run/rpc_pipefs/nfs/. + Some of these directories contain /idmap files, others don't. nfsopen() + returns -1 for the latter; we then want to skip the directory, not abort + the entire scan. + + Reported-by: Sergio Gelato + Closes: https://lore.kernel.org/linux-nfs/ZmCB_zqdu2cynJ1M@astro.su.se/ + Link: https://bugs.debian.org/1072573 + Patch-originally-by: Sergio Gelato + Signed-off-by: Salvatore Bonaccorso + Signed-off-by: Steve Dickson + +diff --git a/utils/idmapd/idmapd.c b/utils/idmapd/idmapd.c +index cd9a965f..5231f56d 100644 +--- a/utils/idmapd/idmapd.c ++++ b/utils/idmapd/idmapd.c +@@ -556,7 +556,7 @@ dirscancb(int fd, short UNUSED(which), void *data) + if (nfsopen(ic) == -1) { + close(ic->ic_dirfd); + free(ic); +- goto out; ++ continue; + } + + if (verbose > 2) diff --git a/nfs-utils.spec b/nfs-utils.spec index 3bb183e..7f53f0f 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -2,7 +2,7 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS ser Name: nfs-utils URL: http://linux-nfs.org/ Version: 2.5.4 -Release: 27%{?dist} +Release: 28%{?dist} Epoch: 1 # group all 32bit related archs @@ -65,6 +65,11 @@ Patch025: nfs-utils-2.5.4-rpcdebug-check-read-return.patch Patch026: nfs-utils-2.5.4-gssd-allowed-enctypes.patch Patch027: nfs-utils-2.5.4-gssd-segfault.patch +# +# RHEL9.6 +# +Patch028: nfs-utils-2.5.4-rpcidmapd-nfsopen-failure.patch + Patch100: nfs-utils-1.2.1-statdpath-man.patch Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch Patch102: nfs-utils-1.2.5-idmap-errmsg.patch @@ -505,6 +510,9 @@ fi %{_mandir}/*/nfsiostat.8.gz %changelog +* Thu Nov 14 2024 Steve Dickson 2.5.4-28 +- rpc.idmapd: nfsopen() failures should not be fatal (RHEL-65727) + * Fri Aug 9 2024 Steve Dickson 2.5.4-27 - rpc-gssd.service has status failed (due to rpc.gssd segfault) (RHEL-43286)