drop nfsd-fixing-possible-null-pointer-derefering-in-copy-offload.patch

diff --git a/queue-5.4/nfsd-fixing-possible-null-pointer-derefering-in-copy-offload.patch b/queue-5.4/nfsd-fixing-possible-null-pointer-derefering-in-copy-offload.patch
deleted file mode 100644 (file)
index 21d8001..0000000
--- a/queue-5.4/nfsd-fixing-possible-null-pointer-derefering-in-copy-offload.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 2e577f0faca4640348c398cb85d60a1eedac4b1e Mon Sep 17 00:00:00 2001
-From: Olga Kornievskaia <olga.kornievskaia@gmail.com>
-Date: Wed, 4 Dec 2019 15:13:54 -0500
-Subject: NFSD fixing possible null pointer derefering in copy offload
-
-From: Olga Kornievskaia <olga.kornievskaia@gmail.com>
-
-commit 2e577f0faca4640348c398cb85d60a1eedac4b1e upstream.
-
-Static checker revealed possible error path leading to possible
-NULL pointer dereferencing.
-
-Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
-Fixes: e0639dc5805a: ("NFSD introduce async copy feature")
-Signed-off-by: Olga Kornievskaia <kolga@netapp.com>
-Signed-off-by: J. Bruce Fields <bfields@redhat.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- fs/nfsd/nfs4proc.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/fs/nfsd/nfs4proc.c
-+++ b/fs/nfsd/nfs4proc.c
-@@ -1223,7 +1223,8 @@ static void cleanup_async_copy(struct nf
- {
-       nfs4_free_cp_state(copy);
-       nfsd_file_put(copy->nf_dst);
--      nfsd_file_put(copy->nf_src);
-+      if (copy->cp_intra)
-+              nfsd_file_put(copy->nf_src);
-       spin_lock(&copy->cp_clp->async_lock);
-       list_del(&copy->copies);
-       spin_unlock(&copy->cp_clp->async_lock);

diff --git a/queue-5.4/series b/queue-5.4/series
index 8ac4e7085ad4fd3cd82930f37ec84e7498882c83..32c12b7a341764fccac7d532ec7ccf03d954e9cf 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -18,7 +18,6 @@ pci-tegra-fix-afi_pex2_ctrl-reg-offset-for-tegra30.patch
 pci-don-t-disable-bridge-bars-when-assigning-bus-resources.patch
 pci-aer-initialize-aer_fifo.patch
 iwlwifi-mvm-avoid-use-after-free-for-pmsr-request.patch
-nfsd-fixing-possible-null-pointer-derefering-in-copy-offload.patch
 nfs-nfs_swap-should-depend-on-swap.patch
 nfs-revalidate-the-file-size-on-a-fatal-write-error.patch
 nfs-pnfs-fix-pnfs_generic_prepare_to_resend_writes.patch

diff --git a/queue-5.5/nfsd-fixing-possible-null-pointer-derefering-in-copy-offload.patch b/queue-5.5/nfsd-fixing-possible-null-pointer-derefering-in-copy-offload.patch
deleted file mode 100644 (file)
index 21d8001..0000000
--- a/queue-5.5/nfsd-fixing-possible-null-pointer-derefering-in-copy-offload.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 2e577f0faca4640348c398cb85d60a1eedac4b1e Mon Sep 17 00:00:00 2001
-From: Olga Kornievskaia <olga.kornievskaia@gmail.com>
-Date: Wed, 4 Dec 2019 15:13:54 -0500
-Subject: NFSD fixing possible null pointer derefering in copy offload
-
-From: Olga Kornievskaia <olga.kornievskaia@gmail.com>
-
-commit 2e577f0faca4640348c398cb85d60a1eedac4b1e upstream.
-
-Static checker revealed possible error path leading to possible
-NULL pointer dereferencing.
-
-Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
-Fixes: e0639dc5805a: ("NFSD introduce async copy feature")
-Signed-off-by: Olga Kornievskaia <kolga@netapp.com>
-Signed-off-by: J. Bruce Fields <bfields@redhat.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- fs/nfsd/nfs4proc.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/fs/nfsd/nfs4proc.c
-+++ b/fs/nfsd/nfs4proc.c
-@@ -1223,7 +1223,8 @@ static void cleanup_async_copy(struct nf
- {
-       nfs4_free_cp_state(copy);
-       nfsd_file_put(copy->nf_dst);
--      nfsd_file_put(copy->nf_src);
-+      if (copy->cp_intra)
-+              nfsd_file_put(copy->nf_src);
-       spin_lock(&copy->cp_clp->async_lock);
-       list_del(&copy->copies);
-       spin_unlock(&copy->cp_clp->async_lock);

diff --git a/queue-5.5/series b/queue-5.5/series
index c9767ef54abf1e2ba7d6bfa2214f5df11d912746..95ba52c36f6fd91465844e71c47b15101734bc32 100644 (file)
--- a/queue-5.5/series
+++ b/queue-5.5/series
@@ -24,7 +24,6 @@ netfilter-flowtable-fetch-stats-only-if-flow-is-still-alive.patch
 netfilter-flowtable-restrict-flow-dissector-match-on-meta-ingress-device.patch
 netfilter-flowtable-fix-hardware-flush-order-on-nf_flow_table_cleanup.patch
 netfilter-flowtable-fix-missing-flush-hardware-on-table-free.patch
-nfsd-fixing-possible-null-pointer-derefering-in-copy-offload.patch
 nfsv4.x-recover-from-pre-mature-loss-of-openstateid.patch
 nfs-nfs_swap-should-depend-on-swap.patch
 nfs-revalidate-the-file-size-on-a-fatal-write-error.patch