From 662ae7dcbce5541de61508083b97c7f3d96ef9b0 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 10 Feb 2020 00:50:59 +0100 Subject: [PATCH] drop cifs patch that broke the build --- ...isting-when-mounted-with-modefromsid.patch | 52 ------------------- queue-4.14/series | 1 - ...isting-when-mounted-with-modefromsid.patch | 52 ------------------- queue-4.19/series | 1 - ...isting-when-mounted-with-modefromsid.patch | 52 ------------------- queue-4.4/series | 1 - ...isting-when-mounted-with-modefromsid.patch | 52 ------------------- queue-4.9/series | 1 - 8 files changed, 212 deletions(-) delete mode 100644 queue-4.14/cifs-fix-mode-bits-from-dir-listing-when-mounted-with-modefromsid.patch delete mode 100644 queue-4.19/cifs-fix-mode-bits-from-dir-listing-when-mounted-with-modefromsid.patch delete mode 100644 queue-4.4/cifs-fix-mode-bits-from-dir-listing-when-mounted-with-modefromsid.patch delete mode 100644 queue-4.9/cifs-fix-mode-bits-from-dir-listing-when-mounted-with-modefromsid.patch diff --git a/queue-4.14/cifs-fix-mode-bits-from-dir-listing-when-mounted-with-modefromsid.patch b/queue-4.14/cifs-fix-mode-bits-from-dir-listing-when-mounted-with-modefromsid.patch deleted file mode 100644 index 3c781f9b966..00000000000 --- a/queue-4.14/cifs-fix-mode-bits-from-dir-listing-when-mounted-with-modefromsid.patch +++ /dev/null @@ -1,52 +0,0 @@ -From e3e056c35108661e418c803adfc054bf683426e7 Mon Sep 17 00:00:00 2001 -From: Aurelien Aptel -Date: Thu, 6 Feb 2020 18:16:55 +0100 -Subject: cifs: fix mode bits from dir listing when mounted with modefromsid - -From: Aurelien Aptel - -commit e3e056c35108661e418c803adfc054bf683426e7 upstream. - -When mounting with -o modefromsid, the mode bits are stored in an -ACE. Directory enumeration (e.g. ls -l /mnt) triggers an SMB Query Dir -which does not include ACEs in its response. The mode bits in this -case are silently set to a default value of 755 instead. - -This patch marks the dentry created during the directory enumeration -as needing re-evaluation (i.e. additional Query Info with ACEs) so -that the mode bits can be properly extracted. - -Quick repro: - -$ mount.cifs //win19.test/data /mnt -o ...,modefromsid -$ touch /mnt/foo && chmod 751 /mnt/foo -$ stat /mnt/foo - # reports 751 (OK) -$ sleep 2 - # dentry older than 1s by default get invalidated -$ ls -l /mnt - # since dentry invalid, ls does a Query Dir - # and reports foo as 755 (WRONG) - -Signed-off-by: Aurelien Aptel -Signed-off-by: Steve French -CC: Stable -Reviewed-by: Pavel Shilovsky -Signed-off-by: Greg Kroah-Hartman - ---- - fs/cifs/readdir.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/fs/cifs/readdir.c -+++ b/fs/cifs/readdir.c -@@ -174,7 +174,8 @@ cifs_fill_common_info(struct cifs_fattr - * may look wrong since the inodes may not have timed out by the time - * "ls" does a stat() call on them. - */ -- if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_ACL) -+ if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_ACL) || -+ (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MODE_FROM_SID)) - fattr->cf_flags |= CIFS_FATTR_NEED_REVAL; - - if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_UNX_EMUL && diff --git a/queue-4.14/series b/queue-4.14/series index 521f3ef895c..2b24820e4de 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -135,6 +135,5 @@ kvm-use-vcpu-specific-gva-hva-translation-when-query.patch kvm-play-nice-with-read-only-memslots-when-querying-.patch kvm-s390-do-not-clobber-registers-during-guest-reset.patch cifs-fail-i-o-on-soft-mounts-if-sessionsetup-errors-out.patch -cifs-fix-mode-bits-from-dir-listing-when-mounted-with-modefromsid.patch clocksource-prevent-double-add_timer_on-for-watchdog_timer.patch perf-core-fix-mlock-accounting-in-perf_mmap.patch diff --git a/queue-4.19/cifs-fix-mode-bits-from-dir-listing-when-mounted-with-modefromsid.patch b/queue-4.19/cifs-fix-mode-bits-from-dir-listing-when-mounted-with-modefromsid.patch deleted file mode 100644 index 3c781f9b966..00000000000 --- a/queue-4.19/cifs-fix-mode-bits-from-dir-listing-when-mounted-with-modefromsid.patch +++ /dev/null @@ -1,52 +0,0 @@ -From e3e056c35108661e418c803adfc054bf683426e7 Mon Sep 17 00:00:00 2001 -From: Aurelien Aptel -Date: Thu, 6 Feb 2020 18:16:55 +0100 -Subject: cifs: fix mode bits from dir listing when mounted with modefromsid - -From: Aurelien Aptel - -commit e3e056c35108661e418c803adfc054bf683426e7 upstream. - -When mounting with -o modefromsid, the mode bits are stored in an -ACE. Directory enumeration (e.g. ls -l /mnt) triggers an SMB Query Dir -which does not include ACEs in its response. The mode bits in this -case are silently set to a default value of 755 instead. - -This patch marks the dentry created during the directory enumeration -as needing re-evaluation (i.e. additional Query Info with ACEs) so -that the mode bits can be properly extracted. - -Quick repro: - -$ mount.cifs //win19.test/data /mnt -o ...,modefromsid -$ touch /mnt/foo && chmod 751 /mnt/foo -$ stat /mnt/foo - # reports 751 (OK) -$ sleep 2 - # dentry older than 1s by default get invalidated -$ ls -l /mnt - # since dentry invalid, ls does a Query Dir - # and reports foo as 755 (WRONG) - -Signed-off-by: Aurelien Aptel -Signed-off-by: Steve French -CC: Stable -Reviewed-by: Pavel Shilovsky -Signed-off-by: Greg Kroah-Hartman - ---- - fs/cifs/readdir.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/fs/cifs/readdir.c -+++ b/fs/cifs/readdir.c -@@ -174,7 +174,8 @@ cifs_fill_common_info(struct cifs_fattr - * may look wrong since the inodes may not have timed out by the time - * "ls" does a stat() call on them. - */ -- if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_ACL) -+ if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_ACL) || -+ (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MODE_FROM_SID)) - fattr->cf_flags |= CIFS_FATTR_NEED_REVAL; - - if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_UNX_EMUL && diff --git a/queue-4.19/series b/queue-4.19/series index 3b68a31fd96..ea3e1a3e7f0 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -189,7 +189,6 @@ mm-zero-remaining-unavailable-struct-pages.patch mm-return-zero_resv_unavail-optimization.patch mm-page_alloc.c-fix-uninitialized-memmaps-on-a-parti.patch cifs-fail-i-o-on-soft-mounts-if-sessionsetup-errors-out.patch -cifs-fix-mode-bits-from-dir-listing-when-mounted-with-modefromsid.patch x86-apic-msi-plug-non-maskable-msi-affinity-race.patch clocksource-prevent-double-add_timer_on-for-watchdog_timer.patch perf-core-fix-mlock-accounting-in-perf_mmap.patch diff --git a/queue-4.4/cifs-fix-mode-bits-from-dir-listing-when-mounted-with-modefromsid.patch b/queue-4.4/cifs-fix-mode-bits-from-dir-listing-when-mounted-with-modefromsid.patch deleted file mode 100644 index e9090490fd0..00000000000 --- a/queue-4.4/cifs-fix-mode-bits-from-dir-listing-when-mounted-with-modefromsid.patch +++ /dev/null @@ -1,52 +0,0 @@ -From e3e056c35108661e418c803adfc054bf683426e7 Mon Sep 17 00:00:00 2001 -From: Aurelien Aptel -Date: Thu, 6 Feb 2020 18:16:55 +0100 -Subject: cifs: fix mode bits from dir listing when mounted with modefromsid - -From: Aurelien Aptel - -commit e3e056c35108661e418c803adfc054bf683426e7 upstream. - -When mounting with -o modefromsid, the mode bits are stored in an -ACE. Directory enumeration (e.g. ls -l /mnt) triggers an SMB Query Dir -which does not include ACEs in its response. The mode bits in this -case are silently set to a default value of 755 instead. - -This patch marks the dentry created during the directory enumeration -as needing re-evaluation (i.e. additional Query Info with ACEs) so -that the mode bits can be properly extracted. - -Quick repro: - -$ mount.cifs //win19.test/data /mnt -o ...,modefromsid -$ touch /mnt/foo && chmod 751 /mnt/foo -$ stat /mnt/foo - # reports 751 (OK) -$ sleep 2 - # dentry older than 1s by default get invalidated -$ ls -l /mnt - # since dentry invalid, ls does a Query Dir - # and reports foo as 755 (WRONG) - -Signed-off-by: Aurelien Aptel -Signed-off-by: Steve French -CC: Stable -Reviewed-by: Pavel Shilovsky -Signed-off-by: Greg Kroah-Hartman - ---- - fs/cifs/readdir.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/fs/cifs/readdir.c -+++ b/fs/cifs/readdir.c -@@ -171,7 +171,8 @@ cifs_fill_common_info(struct cifs_fattr - * may look wrong since the inodes may not have timed out by the time - * "ls" does a stat() call on them. - */ -- if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_ACL) -+ if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_ACL) || -+ (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MODE_FROM_SID)) - fattr->cf_flags |= CIFS_FATTR_NEED_REVAL; - - if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_UNX_EMUL && diff --git a/queue-4.4/series b/queue-4.4/series index 606fa01ca2d..8123f495792 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -75,6 +75,5 @@ kvm-x86-mmu-apply-max-pa-check-for-mmio-sptes-to-32-.patch kvm-vmx-add-non-canonical-check-on-writes-to-rtit-ad.patch kvm-nvmx-vmread-should-not-set-rflags-to-specify-suc.patch cifs-fail-i-o-on-soft-mounts-if-sessionsetup-errors-out.patch -cifs-fix-mode-bits-from-dir-listing-when-mounted-with-modefromsid.patch clocksource-prevent-double-add_timer_on-for-watchdog_timer.patch perf-core-fix-mlock-accounting-in-perf_mmap.patch diff --git a/queue-4.9/cifs-fix-mode-bits-from-dir-listing-when-mounted-with-modefromsid.patch b/queue-4.9/cifs-fix-mode-bits-from-dir-listing-when-mounted-with-modefromsid.patch deleted file mode 100644 index 3c781f9b966..00000000000 --- a/queue-4.9/cifs-fix-mode-bits-from-dir-listing-when-mounted-with-modefromsid.patch +++ /dev/null @@ -1,52 +0,0 @@ -From e3e056c35108661e418c803adfc054bf683426e7 Mon Sep 17 00:00:00 2001 -From: Aurelien Aptel -Date: Thu, 6 Feb 2020 18:16:55 +0100 -Subject: cifs: fix mode bits from dir listing when mounted with modefromsid - -From: Aurelien Aptel - -commit e3e056c35108661e418c803adfc054bf683426e7 upstream. - -When mounting with -o modefromsid, the mode bits are stored in an -ACE. Directory enumeration (e.g. ls -l /mnt) triggers an SMB Query Dir -which does not include ACEs in its response. The mode bits in this -case are silently set to a default value of 755 instead. - -This patch marks the dentry created during the directory enumeration -as needing re-evaluation (i.e. additional Query Info with ACEs) so -that the mode bits can be properly extracted. - -Quick repro: - -$ mount.cifs //win19.test/data /mnt -o ...,modefromsid -$ touch /mnt/foo && chmod 751 /mnt/foo -$ stat /mnt/foo - # reports 751 (OK) -$ sleep 2 - # dentry older than 1s by default get invalidated -$ ls -l /mnt - # since dentry invalid, ls does a Query Dir - # and reports foo as 755 (WRONG) - -Signed-off-by: Aurelien Aptel -Signed-off-by: Steve French -CC: Stable -Reviewed-by: Pavel Shilovsky -Signed-off-by: Greg Kroah-Hartman - ---- - fs/cifs/readdir.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/fs/cifs/readdir.c -+++ b/fs/cifs/readdir.c -@@ -174,7 +174,8 @@ cifs_fill_common_info(struct cifs_fattr - * may look wrong since the inodes may not have timed out by the time - * "ls" does a stat() call on them. - */ -- if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_ACL) -+ if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_ACL) || -+ (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MODE_FROM_SID)) - fattr->cf_flags |= CIFS_FATTR_NEED_REVAL; - - if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_UNX_EMUL && diff --git a/queue-4.9/series b/queue-4.9/series index 4d6628f6633..1a3ad8f4245 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -91,6 +91,5 @@ kvm-x86-mmu-apply-max-pa-check-for-mmio-sptes-to-32-.patch kvm-vmx-add-non-canonical-check-on-writes-to-rtit-ad.patch kvm-nvmx-vmread-should-not-set-rflags-to-specify-suc.patch cifs-fail-i-o-on-soft-mounts-if-sessionsetup-errors-out.patch -cifs-fix-mode-bits-from-dir-listing-when-mounted-with-modefromsid.patch clocksource-prevent-double-add_timer_on-for-watchdog_timer.patch perf-core-fix-mlock-accounting-in-perf_mmap.patch -- 2.47.3