From: Greg Kroah-Hartman Date: Tue, 23 May 2017 19:33:56 +0000 (+0200) Subject: drop a nfs patch that didn't build properly. X-Git-Tag: v3.18.55~9 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c7a75386b9300afcd1bd80888e9d541156f62c36;p=thirdparty%2Fkernel%2Fstable-queue.git drop a nfs patch that didn't build properly. --- diff --git a/queue-4.4/nfsd-fix-up-the-supattr_exclcreat-attributes.patch b/queue-4.4/nfsd-fix-up-the-supattr_exclcreat-attributes.patch deleted file mode 100644 index 8b0e479e7ef..00000000000 --- a/queue-4.4/nfsd-fix-up-the-supattr_exclcreat-attributes.patch +++ /dev/null @@ -1,41 +0,0 @@ -From b26b78cb726007533d81fdf90a62e915002ef5c8 Mon Sep 17 00:00:00 2001 -From: Trond Myklebust -Date: Tue, 9 May 2017 16:24:59 -0400 -Subject: nfsd: Fix up the "supattr_exclcreat" attributes - -From: Trond Myklebust - -commit b26b78cb726007533d81fdf90a62e915002ef5c8 upstream. - -If an NFSv4 client asks us for the supattr_exclcreat, then we must -not return attributes that are unsupported by this minor version. - -Signed-off-by: Trond Myklebust -Fixes: 75976de6556f ("NFSD: Return word2 bitmask if setting security..,") -Signed-off-by: J. Bruce Fields -Signed-off-by: Greg Kroah-Hartman - ---- - fs/nfsd/nfs4xdr.c | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - ---- a/fs/nfsd/nfs4xdr.c -+++ b/fs/nfsd/nfs4xdr.c -@@ -2753,9 +2753,14 @@ out_acl: - } - #endif /* CONFIG_NFSD_PNFS */ - if (bmval2 & FATTR4_WORD2_SUPPATTR_EXCLCREAT) { -- status = nfsd4_encode_bitmap(xdr, NFSD_SUPPATTR_EXCLCREAT_WORD0, -- NFSD_SUPPATTR_EXCLCREAT_WORD1, -- NFSD_SUPPATTR_EXCLCREAT_WORD2); -+ u32 supp[3]; -+ -+ memcpy(supp, nfsd_suppattrs[minorversion], sizeof(supp)); -+ supp[0] &= NFSD_SUPPATTR_EXCLCREAT_WORD0; -+ supp[1] &= NFSD_SUPPATTR_EXCLCREAT_WORD1; -+ supp[2] &= NFSD_SUPPATTR_EXCLCREAT_WORD2; -+ -+ status = nfsd4_encode_bitmap(xdr, supp[0], supp[1], supp[2]); - if (status) - goto out; - } diff --git a/queue-4.4/series b/queue-4.4/series index 71d87fd7385..aeead0d8d36 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -101,6 +101,5 @@ pci-freeze-pme-scan-before-suspending-devices.patch drm-edid-add-10-bpc-quirk-for-lgd-764-panel-in-hp-zbook-17-g2.patch nfsd-check-for-oversized-nfsv2-v3-arguments.patch nfsd-encoders-mustn-t-use-unitialized-values-in-error-cases.patch -nfsd-fix-up-the-supattr_exclcreat-attributes.patch drivers-char-mem-check-for-address-space-wraparound-with-mmap.patch drm-i915-gvt-disable-access-to-stolen-memory-as-a-guest.patch diff --git a/queue-4.9/nfsd-fix-up-the-supattr_exclcreat-attributes.patch b/queue-4.9/nfsd-fix-up-the-supattr_exclcreat-attributes.patch deleted file mode 100644 index 40817da7072..00000000000 --- a/queue-4.9/nfsd-fix-up-the-supattr_exclcreat-attributes.patch +++ /dev/null @@ -1,41 +0,0 @@ -From b26b78cb726007533d81fdf90a62e915002ef5c8 Mon Sep 17 00:00:00 2001 -From: Trond Myklebust -Date: Tue, 9 May 2017 16:24:59 -0400 -Subject: nfsd: Fix up the "supattr_exclcreat" attributes - -From: Trond Myklebust - -commit b26b78cb726007533d81fdf90a62e915002ef5c8 upstream. - -If an NFSv4 client asks us for the supattr_exclcreat, then we must -not return attributes that are unsupported by this minor version. - -Signed-off-by: Trond Myklebust -Fixes: 75976de6556f ("NFSD: Return word2 bitmask if setting security..,") -Signed-off-by: J. Bruce Fields -Signed-off-by: Greg Kroah-Hartman - ---- - fs/nfsd/nfs4xdr.c | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - ---- a/fs/nfsd/nfs4xdr.c -+++ b/fs/nfsd/nfs4xdr.c -@@ -2793,9 +2793,14 @@ out_acl: - } - #endif /* CONFIG_NFSD_PNFS */ - if (bmval2 & FATTR4_WORD2_SUPPATTR_EXCLCREAT) { -- status = nfsd4_encode_bitmap(xdr, NFSD_SUPPATTR_EXCLCREAT_WORD0, -- NFSD_SUPPATTR_EXCLCREAT_WORD1, -- NFSD_SUPPATTR_EXCLCREAT_WORD2); -+ u32 supp[3]; -+ -+ memcpy(supp, nfsd_suppattrs[minorversion], sizeof(supp)); -+ supp[0] &= NFSD_SUPPATTR_EXCLCREAT_WORD0; -+ supp[1] &= NFSD_SUPPATTR_EXCLCREAT_WORD1; -+ supp[2] &= NFSD_SUPPATTR_EXCLCREAT_WORD2; -+ -+ status = nfsd4_encode_bitmap(xdr, supp[0], supp[1], supp[2]); - if (status) - goto out; - } diff --git a/queue-4.9/series b/queue-4.9/series index 21596233007..04997b3c9c8 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -161,6 +161,5 @@ nfs-fix-use-after-free-in-write-error-path.patch nfs-use-gfp_noio-for-two-allocations-in-writeback.patch nfsd-fix-undefined-behavior-in-nfsd4_layout_verify.patch nfsd-encoders-mustn-t-use-unitialized-values-in-error-cases.patch -nfsd-fix-up-the-supattr_exclcreat-attributes.patch drivers-char-mem-check-for-address-space-wraparound-with-mmap.patch drm-i915-gvt-disable-access-to-stolen-memory-as-a-guest.patch