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 894ce1cd22b71d17fb08f74cf93391d53c4abbf6..cd7c5be1832cd44da92a3f96cfa7573d1a08f3f1 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -252,5 +252,4 @@ ib-mlx5-fix-outstanding_pi-index-for-gsi-qps.patch
 ib-core-fix-odp-get-user-pages-flow.patch
 nfsd-fix-delay-timer-on-32-bit-architectures.patch
 nfsd-fix-jiffies-time_t-mixup-in-lru-list.patch
-nfsd-fixing-possible-null-pointer-derefering-in-copy-offload.patch
 nfsd-return-the-correct-number-of-bytes-written-to-the-file.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 4c5ebd20a634592e3dca0818fbaf823a5f4e589a..fdd289ceeae56107c6bfbd5568412f269c4b265a 100644 (file)
--- a/queue-5.5/series
+++ b/queue-5.5/series
@@ -297,5 +297,4 @@ ib-core-fix-odp-with-ib_access_hugetlb-handling.patch
 staging-wfx-revert-unexpected-change-in-debugfs-output.patch
 nfsd-fix-delay-timer-on-32-bit-architectures.patch
 nfsd-fix-jiffies-time_t-mixup-in-lru-list.patch
-nfsd-fixing-possible-null-pointer-derefering-in-copy-offload.patch
 nfsd-return-the-correct-number-of-bytes-written-to-the-file.patch