From: Greg Kroah-Hartman Date: Thu, 13 Feb 2020 02:58:49 +0000 (-0800) Subject: drop nfsd-fixing-possible-null-pointer-derefering-in-copy-offload.patch X-Git-Tag: v4.4.214~30 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=67679a825d0115d280a9ed695d050b53749c6baa;p=thirdparty%2Fkernel%2Fstable-queue.git 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 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 8ac4e7085ad..32c12b7a341 100644 --- 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 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 c9767ef54ab..95ba52c36f6 100644 --- 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