From f05342ad09c118540a9caaaf7d450b0670191709 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 17 May 2018 12:14:00 +0200 Subject: [PATCH] 3.18-stable patches added patches: lockd-lost-rollback-of-set_grace_period-in-lockd_down_net.patch revert-arm-dts-imx6qdl-wandboard-fix-audio-channel-swap.patch --- ...f-set_grace_period-in-lockd_down_net.patch | 42 +++++++++++++++++++ ...qdl-wandboard-fix-audio-channel-swap.patch | 41 ++++++++++++++++++ queue-3.18/series | 2 + 3 files changed, 85 insertions(+) create mode 100644 queue-3.18/lockd-lost-rollback-of-set_grace_period-in-lockd_down_net.patch create mode 100644 queue-3.18/revert-arm-dts-imx6qdl-wandboard-fix-audio-channel-swap.patch diff --git a/queue-3.18/lockd-lost-rollback-of-set_grace_period-in-lockd_down_net.patch b/queue-3.18/lockd-lost-rollback-of-set_grace_period-in-lockd_down_net.patch new file mode 100644 index 00000000000..612100a50dc --- /dev/null +++ b/queue-3.18/lockd-lost-rollback-of-set_grace_period-in-lockd_down_net.patch @@ -0,0 +1,42 @@ +From 3a2b19d1ee5633f76ae8a88da7bc039a5d1732aa Mon Sep 17 00:00:00 2001 +From: Vasily Averin +Date: Thu, 2 Nov 2017 13:03:42 +0300 +Subject: lockd: lost rollback of set_grace_period() in lockd_down_net() + +From: Vasily Averin + +commit 3a2b19d1ee5633f76ae8a88da7bc039a5d1732aa upstream. + +Commit efda760fe95ea ("lockd: fix lockd shutdown race") is incorrect, +it removes lockd_manager and disarm grace_period_end for init_net only. + +If nfsd was started from another net namespace lockd_up_net() calls +set_grace_period() that adds lockd_manager into per-netns list +and queues grace_period_end delayed work. + +These action should be reverted in lockd_down_net(). +Otherwise it can lead to double list_add on after restart nfsd in netns, +and to use-after-free if non-disarmed delayed work will be executed after netns destroy. + +Fixes: efda760fe95e ("lockd: fix lockd shutdown race") +Cc: stable@vger.kernel.org +Signed-off-by: Vasily Averin +Signed-off-by: J. Bruce Fields +Cc: Ben Hutchings +Signed-off-by: Greg Kroah-Hartman + +--- + fs/lockd/svc.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/fs/lockd/svc.c ++++ b/fs/lockd/svc.c +@@ -271,6 +271,8 @@ static void lockd_down_net(struct svc_se + if (ln->nlmsvc_users) { + if (--ln->nlmsvc_users == 0) { + nlm_shutdown_hosts_net(net); ++ cancel_delayed_work_sync(&ln->grace_period_end); ++ locks_end_grace(&ln->lockd_manager); + svc_shutdown_net(serv, net); + dprintk("lockd_down_net: per-net data destroyed; net=%p\n", net); + } diff --git a/queue-3.18/revert-arm-dts-imx6qdl-wandboard-fix-audio-channel-swap.patch b/queue-3.18/revert-arm-dts-imx6qdl-wandboard-fix-audio-channel-swap.patch new file mode 100644 index 00000000000..6389229b095 --- /dev/null +++ b/queue-3.18/revert-arm-dts-imx6qdl-wandboard-fix-audio-channel-swap.patch @@ -0,0 +1,41 @@ +From 4883d1e6062acf00d7cff3f6e73599590cf7a341 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +Date: Thu, 17 May 2018 11:48:48 +0200 +Subject: Revert "ARM: dts: imx6qdl-wandboard: Fix audio channel swap" + +From: Greg Kroah-Hartman + +This reverts commit 2ebf343cbed76773563223761586fd5edcd0dc61 which was +commit 79935915300c5eb88a0e94fa9148a7505c14a02a upstream. + +As Ben points out: + This depends on: + + commit 570c70a60f53ca737ead4e5966c446bf0d39fac9 + Author: Fabio Estevam + Date: Wed Apr 5 11:32:34 2017 -0300 + + ASoC: sgtl5000: Allow LRCLK pad drive strength to be changed + +which did not show up until 4.13, so this makes no sense to have in this +stable branch. + +Reported-by: Ben Hutchings +Cc: Fabio Estevam +Cc: Shawn Guo +Cc: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 1 - + 1 file changed, 1 deletion(-) + +--- a/arch/arm/boot/dts/imx6qdl-wandboard.dtsi ++++ b/arch/arm/boot/dts/imx6qdl-wandboard.dtsi +@@ -86,7 +86,6 @@ + clocks = <&clks 201>; + VDDA-supply = <®_2p5v>; + VDDIO-supply = <®_3p3v>; +- lrclk-strength = <3>; + }; + }; + diff --git a/queue-3.18/series b/queue-3.18/series index d13c6545bf6..a8803397c6b 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -15,3 +15,5 @@ tcp-ignore-fast-open-on-repair-mode.patch sctp-fix-the-issue-that-the-cookie-ack-with-auth-can-t-get-processed.patch sctp-delay-the-authentication-for-the-duplicated-cookie-echo-chunk.patch qmi_wwan-do-not-steal-interfaces-from-class-drivers.patch +lockd-lost-rollback-of-set_grace_period-in-lockd_down_net.patch +revert-arm-dts-imx6qdl-wandboard-fix-audio-channel-swap.patch -- 2.47.3