From: Greg Kroah-Hartman Date: Tue, 5 Apr 2022 17:01:55 +0000 (+0200) Subject: drop arm-ftrace-ensure-that-adr-takes-the-thumb-bit-into-.patch X-Git-Tag: v5.17.2~15 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1b86dcb11640c476a20ba3153d333d636181f8fa;p=thirdparty%2Fkernel%2Fstable-queue.git drop arm-ftrace-ensure-that-adr-takes-the-thumb-bit-into-.patch --- diff --git a/queue-4.14/arm-ftrace-ensure-that-adr-takes-the-thumb-bit-into-.patch b/queue-4.14/arm-ftrace-ensure-that-adr-takes-the-thumb-bit-into-.patch deleted file mode 100644 index 154b6f3a79a..00000000000 --- a/queue-4.14/arm-ftrace-ensure-that-adr-takes-the-thumb-bit-into-.patch +++ /dev/null @@ -1,40 +0,0 @@ -From e3a4944efe6c9f75ba22b35ef87793b2c12a51b0 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 24 Jan 2022 10:38:15 +0100 -Subject: ARM: ftrace: ensure that ADR takes the Thumb bit into account - -From: Ard Biesheuvel - -[ Upstream commit dd88b03ff0c84f4bcbe1419b93a4bed429fed3be ] - -Using ADR to take the address of 'ftrace_stub' via a local label -produces an address that has the Thumb bit cleared, which means the -subsequent comparison is guaranteed to fail. Instead, use the badr -macro, which forces the Thumb bit to be set. - -Fixes: a3ba87a61499 ("ARM: 6316/1: ftrace: add Thumb-2 support") -Signed-off-by: Ard Biesheuvel -Reviewed-by: Nick Desaulniers -Reviewed-by: Steven Rostedt (Google) -Reviewed-by: Linus Walleij -Signed-off-by: Sasha Levin ---- - arch/arm/kernel/entry-ftrace.S | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm/kernel/entry-ftrace.S b/arch/arm/kernel/entry-ftrace.S -index efcd9f25a14b..1acf4d05e94c 100644 ---- a/arch/arm/kernel/entry-ftrace.S -+++ b/arch/arm/kernel/entry-ftrace.S -@@ -66,7 +66,7 @@ - mcount_enter - ldr r0, =ftrace_trace_function - ldr r2, [r0] -- adr r0, .Lftrace_stub -+ badr r0, .Lftrace_stub - cmp r0, r2 - bne 1f - --- -2.34.1 - diff --git a/queue-4.14/series b/queue-4.14/series index cc2ec2bbbc6..8c0455bfdca 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -74,7 +74,6 @@ video-fbdev-smscufx-fix-null-ptr-deref-in-ufx_usb_pr.patch video-fbdev-fbcvt.c-fix-printing-in-fb_cvt_print_nam.patch arm-dts-qcom-ipq4019-fix-sleep-clock.patch soc-ti-wkup_m3_ipc-fix-irq-check-in-wkup_m3_ipc_prob.patch -arm-ftrace-ensure-that-adr-takes-the-thumb-bit-into-.patch media-usb-go7007-s2250-board-fix-leak-in-probe.patch asoc-ti-davinci-i2s-add-check-for-clk_enable.patch alsa-spi-add-check-for-clk_enable.patch diff --git a/queue-4.19/arm-ftrace-ensure-that-adr-takes-the-thumb-bit-into-.patch b/queue-4.19/arm-ftrace-ensure-that-adr-takes-the-thumb-bit-into-.patch deleted file mode 100644 index 273d204c62e..00000000000 --- a/queue-4.19/arm-ftrace-ensure-that-adr-takes-the-thumb-bit-into-.patch +++ /dev/null @@ -1,40 +0,0 @@ -From efde028d425299858f468df653dae29d1f504f1b Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 24 Jan 2022 10:38:15 +0100 -Subject: ARM: ftrace: ensure that ADR takes the Thumb bit into account - -From: Ard Biesheuvel - -[ Upstream commit dd88b03ff0c84f4bcbe1419b93a4bed429fed3be ] - -Using ADR to take the address of 'ftrace_stub' via a local label -produces an address that has the Thumb bit cleared, which means the -subsequent comparison is guaranteed to fail. Instead, use the badr -macro, which forces the Thumb bit to be set. - -Fixes: a3ba87a61499 ("ARM: 6316/1: ftrace: add Thumb-2 support") -Signed-off-by: Ard Biesheuvel -Reviewed-by: Nick Desaulniers -Reviewed-by: Steven Rostedt (Google) -Reviewed-by: Linus Walleij -Signed-off-by: Sasha Levin ---- - arch/arm/kernel/entry-ftrace.S | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm/kernel/entry-ftrace.S b/arch/arm/kernel/entry-ftrace.S -index efcd9f25a14b..1acf4d05e94c 100644 ---- a/arch/arm/kernel/entry-ftrace.S -+++ b/arch/arm/kernel/entry-ftrace.S -@@ -66,7 +66,7 @@ - mcount_enter - ldr r0, =ftrace_trace_function - ldr r2, [r0] -- adr r0, .Lftrace_stub -+ badr r0, .Lftrace_stub - cmp r0, r2 - bne 1f - --- -2.34.1 - diff --git a/queue-4.19/series b/queue-4.19/series index 325b3b9e819..42d2f154be8 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -89,7 +89,6 @@ video-fbdev-smscufx-fix-null-ptr-deref-in-ufx_usb_pr.patch video-fbdev-fbcvt.c-fix-printing-in-fb_cvt_print_nam.patch arm-dts-qcom-ipq4019-fix-sleep-clock.patch soc-ti-wkup_m3_ipc-fix-irq-check-in-wkup_m3_ipc_prob.patch -arm-ftrace-ensure-that-adr-takes-the-thumb-bit-into-.patch media-em28xx-initialize-refcount-before-kref_get.patch media-usb-go7007-s2250-board-fix-leak-in-probe.patch asoc-rt5663-check-the-return-value-of-devm_kzalloc-i.patch diff --git a/queue-4.9/arm-ftrace-ensure-that-adr-takes-the-thumb-bit-into-.patch b/queue-4.9/arm-ftrace-ensure-that-adr-takes-the-thumb-bit-into-.patch deleted file mode 100644 index 3d592625700..00000000000 --- a/queue-4.9/arm-ftrace-ensure-that-adr-takes-the-thumb-bit-into-.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 70a2ec6e037a7c38eb632d23fb9ca2fc10c5e718 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 24 Jan 2022 10:38:15 +0100 -Subject: ARM: ftrace: ensure that ADR takes the Thumb bit into account - -From: Ard Biesheuvel - -[ Upstream commit dd88b03ff0c84f4bcbe1419b93a4bed429fed3be ] - -Using ADR to take the address of 'ftrace_stub' via a local label -produces an address that has the Thumb bit cleared, which means the -subsequent comparison is guaranteed to fail. Instead, use the badr -macro, which forces the Thumb bit to be set. - -Fixes: a3ba87a61499 ("ARM: 6316/1: ftrace: add Thumb-2 support") -Signed-off-by: Ard Biesheuvel -Reviewed-by: Nick Desaulniers -Reviewed-by: Steven Rostedt (Google) -Reviewed-by: Linus Walleij -Signed-off-by: Sasha Levin ---- - arch/arm/kernel/entry-ftrace.S | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm/kernel/entry-ftrace.S b/arch/arm/kernel/entry-ftrace.S -index c73c4030ca5d..6dfb71657d0c 100644 ---- a/arch/arm/kernel/entry-ftrace.S -+++ b/arch/arm/kernel/entry-ftrace.S -@@ -66,7 +66,7 @@ - mcount_enter - ldr r0, =ftrace_trace_function - ldr r2, [r0] -- adr r0, .Lftrace_stub -+ badr r0, .Lftrace_stub - cmp r0, r2 - bne 1f - --- -2.34.1 - diff --git a/queue-4.9/series b/queue-4.9/series index 0b3a45c058e..4316348ecc6 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -56,7 +56,6 @@ video-fbdev-smscufx-fix-null-ptr-deref-in-ufx_usb_pr.patch video-fbdev-fbcvt.c-fix-printing-in-fb_cvt_print_nam.patch arm-dts-qcom-ipq4019-fix-sleep-clock.patch soc-ti-wkup_m3_ipc-fix-irq-check-in-wkup_m3_ipc_prob.patch -arm-ftrace-ensure-that-adr-takes-the-thumb-bit-into-.patch media-usb-go7007-s2250-board-fix-leak-in-probe.patch asoc-ti-davinci-i2s-add-check-for-clk_enable.patch alsa-spi-add-check-for-clk_enable.patch diff --git a/queue-5.10/arm-ftrace-ensure-that-adr-takes-the-thumb-bit-into-.patch b/queue-5.10/arm-ftrace-ensure-that-adr-takes-the-thumb-bit-into-.patch deleted file mode 100644 index 442cea049b2..00000000000 --- a/queue-5.10/arm-ftrace-ensure-that-adr-takes-the-thumb-bit-into-.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 717f7718233c4bd781b6222e876979ae487c0c35 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 24 Jan 2022 10:38:15 +0100 -Subject: ARM: ftrace: ensure that ADR takes the Thumb bit into account - -From: Ard Biesheuvel - -[ Upstream commit dd88b03ff0c84f4bcbe1419b93a4bed429fed3be ] - -Using ADR to take the address of 'ftrace_stub' via a local label -produces an address that has the Thumb bit cleared, which means the -subsequent comparison is guaranteed to fail. Instead, use the badr -macro, which forces the Thumb bit to be set. - -Fixes: a3ba87a61499 ("ARM: 6316/1: ftrace: add Thumb-2 support") -Signed-off-by: Ard Biesheuvel -Reviewed-by: Nick Desaulniers -Reviewed-by: Steven Rostedt (Google) -Reviewed-by: Linus Walleij -Signed-off-by: Sasha Levin ---- - arch/arm/kernel/entry-ftrace.S | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm/kernel/entry-ftrace.S b/arch/arm/kernel/entry-ftrace.S -index a74289ebc803..f4886fb6e9ba 100644 ---- a/arch/arm/kernel/entry-ftrace.S -+++ b/arch/arm/kernel/entry-ftrace.S -@@ -40,7 +40,7 @@ - mcount_enter - ldr r0, =ftrace_trace_function - ldr r2, [r0] -- adr r0, .Lftrace_stub -+ badr r0, .Lftrace_stub - cmp r0, r2 - bne 1f - --- -2.34.1 - diff --git a/queue-5.10/series b/queue-5.10/series index ee086bd0578..a0fe9153f13 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -210,7 +210,6 @@ arm64-dts-qcom-sm8150-correct-tcs-configuration-for-.patch firmware-ti_sci-fix-compilation-failure-when-config_.patch soc-ti-wkup_m3_ipc-fix-irq-check-in-wkup_m3_ipc_prob.patch arm-dts-sun8i-v3s-move-the-csi1-block-to-follow-addr.patch -arm-ftrace-ensure-that-adr-takes-the-thumb-bit-into-.patch arm-dts-imx-add-missing-lvds-decoder-on-m53menlo.patch media-video-hdmi-handle-short-reads-of-hdmi-info-fra.patch media-em28xx-initialize-refcount-before-kref_get.patch diff --git a/queue-5.15/arm-ftrace-ensure-that-adr-takes-the-thumb-bit-into-.patch b/queue-5.15/arm-ftrace-ensure-that-adr-takes-the-thumb-bit-into-.patch deleted file mode 100644 index d5539b1b96c..00000000000 --- a/queue-5.15/arm-ftrace-ensure-that-adr-takes-the-thumb-bit-into-.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 1d30dd3d3b886d990b37e7a35c9a9f66eee0b1d4 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 24 Jan 2022 10:38:15 +0100 -Subject: ARM: ftrace: ensure that ADR takes the Thumb bit into account - -From: Ard Biesheuvel - -[ Upstream commit dd88b03ff0c84f4bcbe1419b93a4bed429fed3be ] - -Using ADR to take the address of 'ftrace_stub' via a local label -produces an address that has the Thumb bit cleared, which means the -subsequent comparison is guaranteed to fail. Instead, use the badr -macro, which forces the Thumb bit to be set. - -Fixes: a3ba87a61499 ("ARM: 6316/1: ftrace: add Thumb-2 support") -Signed-off-by: Ard Biesheuvel -Reviewed-by: Nick Desaulniers -Reviewed-by: Steven Rostedt (Google) -Reviewed-by: Linus Walleij -Signed-off-by: Sasha Levin ---- - arch/arm/kernel/entry-ftrace.S | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm/kernel/entry-ftrace.S b/arch/arm/kernel/entry-ftrace.S -index a74289ebc803..f4886fb6e9ba 100644 ---- a/arch/arm/kernel/entry-ftrace.S -+++ b/arch/arm/kernel/entry-ftrace.S -@@ -40,7 +40,7 @@ - mcount_enter - ldr r0, =ftrace_trace_function - ldr r2, [r0] -- adr r0, .Lftrace_stub -+ badr r0, .Lftrace_stub - cmp r0, r2 - bne 1f - --- -2.34.1 - diff --git a/queue-5.15/series b/queue-5.15/series index 0aa8474b09b..27bc80ea2d6 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -304,7 +304,6 @@ arm64-dts-qcom-sm8350-correct-tcs-configuration-for-.patch firmware-ti_sci-fix-compilation-failure-when-config_.patch soc-ti-wkup_m3_ipc-fix-irq-check-in-wkup_m3_ipc_prob.patch arm-dts-sun8i-v3s-move-the-csi1-block-to-follow-addr.patch -arm-ftrace-ensure-that-adr-takes-the-thumb-bit-into-.patch vsprintf-fix-potential-unaligned-access.patch arm-dts-imx-add-missing-lvds-decoder-on-m53menlo.patch media-mexon-ge2d-fixup-frames-size-in-registers.patch diff --git a/queue-5.16/arm-ftrace-ensure-that-adr-takes-the-thumb-bit-into-.patch b/queue-5.16/arm-ftrace-ensure-that-adr-takes-the-thumb-bit-into-.patch deleted file mode 100644 index 6618f964748..00000000000 --- a/queue-5.16/arm-ftrace-ensure-that-adr-takes-the-thumb-bit-into-.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 85860b7fbac53ba043e57dfcab41d86c4f219ad7 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 24 Jan 2022 10:38:15 +0100 -Subject: ARM: ftrace: ensure that ADR takes the Thumb bit into account - -From: Ard Biesheuvel - -[ Upstream commit dd88b03ff0c84f4bcbe1419b93a4bed429fed3be ] - -Using ADR to take the address of 'ftrace_stub' via a local label -produces an address that has the Thumb bit cleared, which means the -subsequent comparison is guaranteed to fail. Instead, use the badr -macro, which forces the Thumb bit to be set. - -Fixes: a3ba87a61499 ("ARM: 6316/1: ftrace: add Thumb-2 support") -Signed-off-by: Ard Biesheuvel -Reviewed-by: Nick Desaulniers -Reviewed-by: Steven Rostedt (Google) -Reviewed-by: Linus Walleij -Signed-off-by: Sasha Levin ---- - arch/arm/kernel/entry-ftrace.S | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm/kernel/entry-ftrace.S b/arch/arm/kernel/entry-ftrace.S -index a74289ebc803..f4886fb6e9ba 100644 ---- a/arch/arm/kernel/entry-ftrace.S -+++ b/arch/arm/kernel/entry-ftrace.S -@@ -40,7 +40,7 @@ - mcount_enter - ldr r0, =ftrace_trace_function - ldr r2, [r0] -- adr r0, .Lftrace_stub -+ badr r0, .Lftrace_stub - cmp r0, r2 - bne 1f - --- -2.34.1 - diff --git a/queue-5.16/series b/queue-5.16/series index 076ac8ef9f8..43b646e8f82 100644 --- a/queue-5.16/series +++ b/queue-5.16/series @@ -325,7 +325,6 @@ soc-ti-wkup_m3_ipc-fix-irq-check-in-wkup_m3_ipc_prob.patch cpuidle-qcom-spm-check-if-any-cpu-is-managed-by-spm.patch arm-dts-sun8i-v3s-move-the-csi1-block-to-follow-addr.patch arm-dts-stm32-fix-av96-board-sai2-pin-muxing-on-stm3.patch -arm-ftrace-ensure-that-adr-takes-the-thumb-bit-into-.patch vsprintf-fix-potential-unaligned-access.patch arm-dts-imx-add-missing-lvds-decoder-on-m53menlo.patch media-mexon-ge2d-fixup-frames-size-in-registers.patch diff --git a/queue-5.17/arm-ftrace-ensure-that-adr-takes-the-thumb-bit-into-.patch b/queue-5.17/arm-ftrace-ensure-that-adr-takes-the-thumb-bit-into-.patch deleted file mode 100644 index 2f1b77d429a..00000000000 --- a/queue-5.17/arm-ftrace-ensure-that-adr-takes-the-thumb-bit-into-.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 496cae1d6982fb276f10c53b4823c6429b72163b Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 24 Jan 2022 10:38:15 +0100 -Subject: ARM: ftrace: ensure that ADR takes the Thumb bit into account - -From: Ard Biesheuvel - -[ Upstream commit dd88b03ff0c84f4bcbe1419b93a4bed429fed3be ] - -Using ADR to take the address of 'ftrace_stub' via a local label -produces an address that has the Thumb bit cleared, which means the -subsequent comparison is guaranteed to fail. Instead, use the badr -macro, which forces the Thumb bit to be set. - -Fixes: a3ba87a61499 ("ARM: 6316/1: ftrace: add Thumb-2 support") -Signed-off-by: Ard Biesheuvel -Reviewed-by: Nick Desaulniers -Reviewed-by: Steven Rostedt (Google) -Reviewed-by: Linus Walleij -Signed-off-by: Sasha Levin ---- - arch/arm/kernel/entry-ftrace.S | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm/kernel/entry-ftrace.S b/arch/arm/kernel/entry-ftrace.S -index a74289ebc803..f4886fb6e9ba 100644 ---- a/arch/arm/kernel/entry-ftrace.S -+++ b/arch/arm/kernel/entry-ftrace.S -@@ -40,7 +40,7 @@ - mcount_enter - ldr r0, =ftrace_trace_function - ldr r2, [r0] -- adr r0, .Lftrace_stub -+ badr r0, .Lftrace_stub - cmp r0, r2 - bne 1f - --- -2.34.1 - diff --git a/queue-5.17/series b/queue-5.17/series index ed498be3844..539443503dd 100644 --- a/queue-5.17/series +++ b/queue-5.17/series @@ -342,7 +342,6 @@ soc-ti-wkup_m3_ipc-fix-irq-check-in-wkup_m3_ipc_prob.patch cpuidle-qcom-spm-check-if-any-cpu-is-managed-by-spm.patch arm-dts-sun8i-v3s-move-the-csi1-block-to-follow-addr.patch arm-dts-stm32-fix-av96-board-sai2-pin-muxing-on-stm3.patch -arm-ftrace-ensure-that-adr-takes-the-thumb-bit-into-.patch vsprintf-fix-potential-unaligned-access.patch arm-dts-qcom-sdx55-fix-the-address-used-for-pcie-ep-.patch arm-dts-imx-add-missing-lvds-decoder-on-m53menlo.patch diff --git a/queue-5.4/arm-ftrace-ensure-that-adr-takes-the-thumb-bit-into-.patch b/queue-5.4/arm-ftrace-ensure-that-adr-takes-the-thumb-bit-into-.patch deleted file mode 100644 index ef4be217635..00000000000 --- a/queue-5.4/arm-ftrace-ensure-that-adr-takes-the-thumb-bit-into-.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 0dc6e82f43b936eb10c696712c3fd18eff2ef566 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 24 Jan 2022 10:38:15 +0100 -Subject: ARM: ftrace: ensure that ADR takes the Thumb bit into account - -From: Ard Biesheuvel - -[ Upstream commit dd88b03ff0c84f4bcbe1419b93a4bed429fed3be ] - -Using ADR to take the address of 'ftrace_stub' via a local label -produces an address that has the Thumb bit cleared, which means the -subsequent comparison is guaranteed to fail. Instead, use the badr -macro, which forces the Thumb bit to be set. - -Fixes: a3ba87a61499 ("ARM: 6316/1: ftrace: add Thumb-2 support") -Signed-off-by: Ard Biesheuvel -Reviewed-by: Nick Desaulniers -Reviewed-by: Steven Rostedt (Google) -Reviewed-by: Linus Walleij -Signed-off-by: Sasha Levin ---- - arch/arm/kernel/entry-ftrace.S | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm/kernel/entry-ftrace.S b/arch/arm/kernel/entry-ftrace.S -index a74289ebc803..f4886fb6e9ba 100644 ---- a/arch/arm/kernel/entry-ftrace.S -+++ b/arch/arm/kernel/entry-ftrace.S -@@ -40,7 +40,7 @@ - mcount_enter - ldr r0, =ftrace_trace_function - ldr r2, [r0] -- adr r0, .Lftrace_stub -+ badr r0, .Lftrace_stub - cmp r0, r2 - bne 1f - --- -2.34.1 - diff --git a/queue-5.4/series b/queue-5.4/series index a3a7ca4bbbc..42834c4ac9b 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -122,7 +122,6 @@ soc-qcom-rpmpd-check-for-null-return-of-devm_kcalloc.patch soc-qcom-aoss-remove-spurious-irqf_oneshot-flags.patch arm64-dts-qcom-sm8150-correct-tcs-configuration-for-.patch soc-ti-wkup_m3_ipc-fix-irq-check-in-wkup_m3_ipc_prob.patch -arm-ftrace-ensure-that-adr-takes-the-thumb-bit-into-.patch arm-dts-imx-add-missing-lvds-decoder-on-m53menlo.patch media-video-hdmi-handle-short-reads-of-hdmi-info-fra.patch media-em28xx-initialize-refcount-before-kref_get.patch