From: Greg Kroah-Hartman Date: Sun, 15 Mar 2020 08:22:46 +0000 (+0100) Subject: drop nfs patch as it broke the build X-Git-Tag: v4.19.110~14 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ee8409c268a8237c1c1ac2986b27d11beda934fa;p=thirdparty%2Fkernel%2Fstable-queue.git drop nfs patch as it broke the build --- 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 3c689f2c7a8..211ac97523e 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -2,4 +2,3 @@ virtio_balloon-adjust-label-in-virtballoon_probe.patch alsa-hda-realtek-more-constifications.patch alsa-hda-realtek-add-headset-mic-supported-for-hp-cpc.patch alsa-hda-realtek-fixed-one-of-hp-alc671-platform-headset-mic-supported.patch -nfsd-fixing-possible-null-pointer-derefering-in-copy-offload.patch diff --git a/queue-5.5/nfsd-fixing-possible-null-pointer-derefering-in-copy.patch b/queue-5.5/nfsd-fixing-possible-null-pointer-derefering-in-copy.patch deleted file mode 100644 index 266f5879186..00000000000 --- a/queue-5.5/nfsd-fixing-possible-null-pointer-derefering-in-copy.patch +++ /dev/null @@ -1,38 +0,0 @@ -From a264e7b209f248f59b4fee0d1ed3fbde014a942e Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 4 Dec 2019 15:13:54 -0500 -Subject: NFSD fixing possible null pointer derefering in copy offload - -From: Olga Kornievskaia - -[ Upstream commit 2e577f0faca4640348c398cb85d60a1eedac4b1e ] - -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: Sasha Levin ---- - fs/nfsd/nfs4proc.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c -index 4798667af647c..91b64c15556e6 100644 ---- a/fs/nfsd/nfs4proc.c -+++ b/fs/nfsd/nfs4proc.c -@@ -1223,7 +1223,8 @@ static void cleanup_async_copy(struct nfsd4_copy *copy) - { - 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); --- -2.20.1 - diff --git a/queue-5.5/series b/queue-5.5/series index bc655a1f36e..7aea40800de 100644 --- a/queue-5.5/series +++ b/queue-5.5/series @@ -2,4 +2,3 @@ virtio_balloon-adjust-label-in-virtballoon_probe.patch alsa-hda-realtek-more-constifications.patch alsa-hda-realtek-add-headset-mic-supported-for-hp-cp.patch alsa-hda-realtek-fixed-one-of-hp-alc671-platform-hea.patch -nfsd-fixing-possible-null-pointer-derefering-in-copy.patch