From: Greg Kroah-Hartman Date: Mon, 1 Feb 2021 15:56:50 +0000 (+0100) Subject: 4.9-stable patches X-Git-Tag: v4.4.255~27 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=386cf771e495f14d6bbf3b7da2fd146c0bb1632c;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: arm-imx-build-suspend-imx6.s-with-arm-instruction-set.patch netfilter-nft_dynset-add-timeout-extension-to-template.patch --- diff --git a/queue-4.9/arm-imx-build-suspend-imx6.s-with-arm-instruction-set.patch b/queue-4.9/arm-imx-build-suspend-imx6.s-with-arm-instruction-set.patch new file mode 100644 index 00000000000..46207110f4b --- /dev/null +++ b/queue-4.9/arm-imx-build-suspend-imx6.s-with-arm-instruction-set.patch @@ -0,0 +1,39 @@ +From a88afa46b86ff461c89cc33fc3a45267fff053e8 Mon Sep 17 00:00:00 2001 +From: Max Krummenacher +Date: Mon, 11 Jan 2021 16:17:04 +0100 +Subject: ARM: imx: build suspend-imx6.S with arm instruction set + +From: Max Krummenacher + +commit a88afa46b86ff461c89cc33fc3a45267fff053e8 upstream. + +When the kernel is configured to use the Thumb-2 instruction set +"suspend-to-memory" fails to resume. Observed on a Colibri iMX6ULL +(i.MX 6ULL) and Apalis iMX6 (i.MX 6Q). + +It looks like the CPU resumes unconditionally in ARM instruction mode +and then chokes on the presented Thumb-2 code it should execute. + +Fix this by using the arm instruction set for all code in +suspend-imx6.S. + +Signed-off-by: Max Krummenacher +Fixes: df595746fa69 ("ARM: imx: add suspend in ocram support for i.mx6q") +Acked-by: Oleksandr Suvorov +Signed-off-by: Shawn Guo +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm/mach-imx/suspend-imx6.S | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/arm/mach-imx/suspend-imx6.S ++++ b/arch/arm/mach-imx/suspend-imx6.S +@@ -73,6 +73,7 @@ + #define MX6Q_CCM_CCR 0x0 + + .align 3 ++ .arm + + .macro sync_l2_cache + diff --git a/queue-4.9/netfilter-nft_dynset-add-timeout-extension-to-template.patch b/queue-4.9/netfilter-nft_dynset-add-timeout-extension-to-template.patch new file mode 100644 index 00000000000..e42ea87fc9f --- /dev/null +++ b/queue-4.9/netfilter-nft_dynset-add-timeout-extension-to-template.patch @@ -0,0 +1,37 @@ +From 0c5b7a501e7400869ee905b4f7af3d6717802bcb Mon Sep 17 00:00:00 2001 +From: Pablo Neira Ayuso +Date: Sat, 16 Jan 2021 19:20:15 +0100 +Subject: netfilter: nft_dynset: add timeout extension to template + +From: Pablo Neira Ayuso + +commit 0c5b7a501e7400869ee905b4f7af3d6717802bcb upstream. + +Otherwise, the newly create element shows no timeout when listing the +ruleset. If the set definition does not specify a default timeout, then +the set element only shows the expiration time, but not the timeout. +This is a problem when restoring a stateful ruleset listing since it +skips the timeout policy entirely. + +Fixes: 22fe54d5fefc ("netfilter: nf_tables: add support for dynamic set updates") +Signed-off-by: Pablo Neira Ayuso +Signed-off-by: Greg Kroah-Hartman + +--- + net/netfilter/nft_dynset.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- a/net/netfilter/nft_dynset.c ++++ b/net/netfilter/nft_dynset.c +@@ -210,8 +210,10 @@ static int nft_dynset_init(const struct + nft_set_ext_add_length(&priv->tmpl, NFT_SET_EXT_EXPR, + priv->expr->ops->size); + if (set->flags & NFT_SET_TIMEOUT) { +- if (timeout || set->timeout) ++ if (timeout || set->timeout) { ++ nft_set_ext_add(&priv->tmpl, NFT_SET_EXT_TIMEOUT); + nft_set_ext_add(&priv->tmpl, NFT_SET_EXT_EXPIRATION); ++ } + } + + priv->timeout = timeout; diff --git a/queue-4.9/series b/queue-4.9/series index 4e0a9bb7d63..629876566c7 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -18,3 +18,5 @@ kvm-x86-get-smi-pending-status-correctly.patch leds-trigger-fix-potential-deadlock-with-libata.patch mt7601u-fix-kernel-crash-unplugging-the-device.patch mt7601u-fix-rx-buffer-refcounting.patch +arm-imx-build-suspend-imx6.s-with-arm-instruction-set.patch +netfilter-nft_dynset-add-timeout-extension-to-template.patch