diff --git a/NFS-fix-clp-cl_revoked-list-deletion-causing-softloc.patch b/NFS-fix-clp-cl_revoked-list-deletion-causing-softloc.patch new file mode 100644 index 0000000..a7067ff --- /dev/null +++ b/NFS-fix-clp-cl_revoked-list-deletion-causing-softloc.patch @@ -0,0 +1,35 @@ +From: Andrew Elble +Date: Wed, 25 Feb 2015 13:42:55 -0500 +Subject: [PATCH] NFS: fix clp->cl_revoked list deletion causing softlock in + nfsd + +commit 2d4a532d385f ("nfsd: ensure that clp->cl_revoked list is +protected by clp->cl_lock") removed the use of the reaplist to +clean out clp->cl_revoked. It failed to change list_entry() to +walk clp->cl_revoked.next instead of reaplist.next + +Fixes: 2d4a532d385f ("nfsd: ensure that clp->cl_revoked list is protected by clp->cl_lock") +Cc: stable@vger.kernel.org +Reported-by: Eric Meddaugh +Tested-by: Eric Meddaugh +Signed-off-by: Andrew Elble +--- + fs/nfsd/nfs4state.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c +index d66e3ad1de48..5c9c13ee72f9 100644 +--- a/fs/nfsd/nfs4state.c ++++ b/fs/nfsd/nfs4state.c +@@ -1650,7 +1650,7 @@ __destroy_client(struct nfs4_client *clp) + nfs4_put_stid(&dp->dl_stid); + } + while (!list_empty(&clp->cl_revoked)) { +- dp = list_entry(reaplist.next, struct nfs4_delegation, dl_recall_lru); ++ dp = list_entry(clp->cl_revoked.next, struct nfs4_delegation, dl_recall_lru); + list_del_init(&dp->dl_recall_lru); + nfs4_put_stid(&dp->dl_stid); + } +-- +2.1.0 + diff --git a/kernel.spec b/kernel.spec index d898a4a..b28ae4e 100644 --- a/kernel.spec +++ b/kernel.spec @@ -644,6 +644,9 @@ Patch26135: ASLR-fix-stack-randomization-on-64-bit-systems.patch #CVE-XXXX-XXXX rhbz 1189864 1192079 Patch26136: vhost-scsi-potential-memory-corruption.patch +#rhbz 1185519 +Patch26142: NFS-fix-clp-cl_revoked-list-deletion-causing-softloc.patch + #CVE-2015-0275 rhbz 1193907 1195178 Patch26138: ext4-Allocate-entire-range-in-zero-range.patch @@ -1411,6 +1414,9 @@ ApplyPatch HID-i2c-hid-Limit-reads-to-wMaxInputLength-bytes-for.patch #rhbz 1190947 ApplyPatch Bluetooth-ath3k-Add-support-Atheros-AR5B195-combo-Mi.patch +#rhbz 1185519 +ApplyPatch NFS-fix-clp-cl_revoked-list-deletion-causing-softloc.patch + %if 0%{?aarch64patches} ApplyPatch kernel-arm64.patch %ifnarch aarch64 # this is stupid, but i want to notice before secondary koji does. @@ -2282,6 +2288,7 @@ fi # || || %changelog * Mon Mar 02 2015 Josh Boyer +- Add patch to fix nfsd soft lockup (rhbz 1185519) - Enable ET131X driver (rhbz 1197842) * Sat Feb 28 2015 Peter Robinson