5.4-stable patches

added patches:
	convert-trailing-spaces-and-periods-in-path-components.patch
	net-sch_generic-fix-the-missing-new-qdisc-assignment-bug.patch

diff --git a/queue-5.4/convert-trailing-spaces-and-periods-in-path-components.patch b/queue-5.4/convert-trailing-spaces-and-periods-in-path-components.patch
new file mode 100644 (file)
index 0000000..3752dd0
--- /dev/null
+++ b/queue-5.4/convert-trailing-spaces-and-periods-in-path-components.patch
@@ -0,0 +1,43 @@
+From 57c176074057531b249cf522d90c22313fa74b0b Mon Sep 17 00:00:00 2001
+From: Boris Protopopov <pboris@amazon.com>
+Date: Thu, 24 Sep 2020 00:36:38 +0000
+Subject: Convert trailing spaces and periods in path components
+
+From: Boris Protopopov <pboris@amazon.com>
+
+commit 57c176074057531b249cf522d90c22313fa74b0b upstream.
+
+When converting trailing spaces and periods in paths, do so
+for every component of the path, not just the last component.
+If the conversion is not done for every path component, then
+subsequent operations in directories with trailing spaces or
+periods (e.g. create(), mkdir()) will fail with ENOENT. This
+is because on the server, the directory will have a special
+symbol in its name, and the client needs to provide the same.
+
+Signed-off-by: Boris Protopopov <pboris@amazon.com>
+Acked-by: Ronnie Sahlberg <lsahlber@redhat.com>
+Signed-off-by: Steve French <stfrench@microsoft.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ fs/cifs/cifs_unicode.c |    8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+--- a/fs/cifs/cifs_unicode.c
++++ b/fs/cifs/cifs_unicode.c
+@@ -488,7 +488,13 @@ cifsConvertToUTF16(__le16 *target, const
+               else if (map_chars == SFM_MAP_UNI_RSVD) {
+                       bool end_of_string;
+ 
+-                      if (i == srclen - 1)
++                      /**
++                       * Remap spaces and periods found at the end of every
++                       * component of the path. The special cases of '.' and
++                       * '..' do not need to be dealt with explicitly because
++                       * they are addressed in namei.c:link_path_walk().
++                       **/
++                      if ((i == srclen - 1) || (source[i+1] == '\\'))
+                               end_of_string = true;
+                       else
+                               end_of_string = false;

diff --git a/queue-5.4/net-sch_generic-fix-the-missing-new-qdisc-assignment-bug.patch b/queue-5.4/net-sch_generic-fix-the-missing-new-qdisc-assignment-bug.patch
new file mode 100644 (file)
index 0000000..e872f80
--- /dev/null
+++ b/queue-5.4/net-sch_generic-fix-the-missing-new-qdisc-assignment-bug.patch
@@ -0,0 +1,44 @@
+From linyunsheng@huawei.com  Tue Nov 17 13:08:29 2020
+From: Yunsheng Lin <linyunsheng@huawei.com>
+Date: Tue, 3 Nov 2020 11:25:38 +0800
+Subject: net: sch_generic: fix the missing new qdisc assignment bug
+To: <gregkh@linuxfoundation.org>, <stable@vger.kernel.org>
+Cc: <vpai@akamai.com>, <Joakim.Tjernlund@infinera.com>, <xiyou.wangcong@gmail.com>, <johunt@akamai.com>, <jhs@mojatatu.com>, <jiri@resnulli.us>, <davem@davemloft.net>, <kuba@kernel.org>, <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <linuxarm@huawei.com>, <john.fastabend@gmail.com>, <eric.dumazet@gmail.com>, <dsahern@gmail.com>
+Message-ID: <1604373938-211588-1-git-send-email-linyunsheng@huawei.com>
+
+
+When commit 2fb541c862c9 ("net: sch_generic: aviod concurrent reset and
+enqueue op for lockless qdisc") is backported to stable kernel, one
+assignment is missing, which causes two problems reported by Joakim and
+Vishwanath, see [1] and [2].
+
+So add the assignment back to fix it.
+
+1. https://www.spinics.net/lists/netdev/msg693916.html
+2. https://www.spinics.net/lists/netdev/msg695131.html
+
+Fixes: 749cc0b0c7f3 ("net: sch_generic: aviod concurrent reset and enqueue op for lockless qdisc")
+Signed-off-by: Yunsheng Lin <linyunsheng@huawei.com>
+Acked-by: Jakub Kicinski <kuba@kernel.org>
+Tested-by: Brian Norris <briannorris@chromium.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ net/sched/sch_generic.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/net/sched/sch_generic.c
++++ b/net/sched/sch_generic.c
+@@ -1127,10 +1127,13 @@ static void dev_deactivate_queue(struct
+                                void *_qdisc_default)
+ {
+       struct Qdisc *qdisc = rtnl_dereference(dev_queue->qdisc);
++      struct Qdisc *qdisc_default = _qdisc_default;
+ 
+       if (qdisc) {
+               if (!(qdisc->flags & TCQ_F_BUILTIN))
+                       set_bit(__QDISC_STATE_DEACTIVATED, &qdisc->state);
++
++              rcu_assign_pointer(dev_queue->qdisc, qdisc_default);
+       }
+ }
+ 

diff --git a/queue-5.4/series b/queue-5.4/series
index 56610a7f9fb8d77ba18900923b06c7da7046da97..85f0c844fc7fa22c09700f18c38640d53e4c235c 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -147,3 +147,5 @@ powerpc-603-always-fault-when-_page_accessed-is-not-set.patch
 x86-speculation-allow-ibpb-to-be-conditionally-enabled-on-cpus-with-always-on-stibp.patch
 perf-scripting-python-avoid-declaring-function-pointers-with-a-visibility-attribute.patch
 perf-core-fix-race-in-the-perf_mmap_close-function.patch
+net-sch_generic-fix-the-missing-new-qdisc-assignment-bug.patch
+convert-trailing-spaces-and-periods-in-path-components.patch