From 985ac3b089f623be1e3c44d45f5bedae9feb0faa Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 9 Feb 2020 18:43:03 +0100 Subject: [PATCH] drop nfsd-fixing-possible-null-pointer-derefering-in-copy-offload.patch --- ...l-pointer-derefering-in-copy-offload.patch | 34 ------------------- queue-5.4/series | 1 - ...l-pointer-derefering-in-copy-offload.patch | 34 ------------------- queue-5.5/series | 1 - 4 files changed, 70 deletions(-) delete mode 100644 queue-5.4/nfsd-fixing-possible-null-pointer-derefering-in-copy-offload.patch delete mode 100644 queue-5.5/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 index 21d80011bbf..00000000000 --- 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 -Date: Wed, 4 Dec 2019 15:13:54 -0500 -Subject: NFSD fixing possible null pointer derefering in copy offload - -From: Olga Kornievskaia - -commit 2e577f0faca4640348c398cb85d60a1eedac4b1e upstream. - -Static checker revealed possible error path leading to possible -NULL pointer dereferencing. - -Reported-by: Dan Carpenter -Fixes: e0639dc5805a: ("NFSD introduce async copy feature") -Signed-off-by: Olga Kornievskaia -Signed-off-by: J. Bruce Fields -Signed-off-by: Greg Kroah-Hartman - ---- - 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(©->cp_clp->async_lock); - list_del(©->copies); - spin_unlock(©->cp_clp->async_lock); diff --git a/queue-5.4/series b/queue-5.4/series index 894ce1cd22b..cd7c5be1832 100644 --- 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 index 21d80011bbf..00000000000 --- 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 -Date: Wed, 4 Dec 2019 15:13:54 -0500 -Subject: NFSD fixing possible null pointer derefering in copy offload - -From: Olga Kornievskaia - -commit 2e577f0faca4640348c398cb85d60a1eedac4b1e upstream. - -Static checker revealed possible error path leading to possible -NULL pointer dereferencing. - -Reported-by: Dan Carpenter -Fixes: e0639dc5805a: ("NFSD introduce async copy feature") -Signed-off-by: Olga Kornievskaia -Signed-off-by: J. Bruce Fields -Signed-off-by: Greg Kroah-Hartman - ---- - 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(©->cp_clp->async_lock); - list_del(©->copies); - spin_unlock(©->cp_clp->async_lock); diff --git a/queue-5.5/series b/queue-5.5/series index 4c5ebd20a63..fdd289ceeae 100644 --- 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 -- 2.47.3