From: Greg Kroah-Hartman Date: Thu, 29 May 2025 09:08:08 +0000 (+0200) Subject: Linux 6.12.31 X-Git-Tag: v6.12.31^0 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=af22cb4d3ecee71ca9039a174ff684650f21ff8f;p=thirdparty%2Fkernel%2Fstable-queue.git Linux 6.12.31 --- diff --git a/queue-6.12/series b/queue-6.12/series index 9789447e77..8228d50060 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -346,7 +346,6 @@ eth-mlx4-don-t-try-to-complete-xdp-frames-in-netpoll.patch pci-fix-old_size-lower-bound-in-calculate_iosize-too.patch acpi-hed-always-initialize-before-evged.patch vxlan-join-leave-mc-group-after-remote-changes.patch -x86-boot-disable-stack-protector-for-early-boot-code.patch hrtimers-replace-hrtimer_clock_to_base_table-with-sw.patch irqchip-riscv-imsic-set-irq_set_affinity-for-imsic-b.patch media-test-drivers-vivid-don-t-call-schedule-in-loop.patch diff --git a/queue-6.12/x86-boot-disable-stack-protector-for-early-boot-code.patch b/queue-6.12/x86-boot-disable-stack-protector-for-early-boot-code.patch deleted file mode 100644 index 7aac650751..0000000000 --- a/queue-6.12/x86-boot-disable-stack-protector-for-early-boot-code.patch +++ /dev/null @@ -1,44 +0,0 @@ -From f3a1f548fbc2cab8c4d91ecfea486ba5fca42986 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 23 Jan 2025 14:07:35 -0500 -Subject: x86/boot: Disable stack protector for early boot code - -From: Brian Gerst - -[ Upstream commit a9a76b38aaf577887103e3ebb41d70e6aa5a4b19 ] - -On 64-bit, this will prevent crashes when the canary access is changed -from %gs:40 to %gs:__stack_chk_guard(%rip). RIP-relative addresses from -the identity-mapped early boot code will target the wrong address with -zero-based percpu. KASLR could then shift that address to an unmapped -page causing a crash on boot. - -This early boot code runs well before user-space is active and does not -need stack protector enabled. - -Signed-off-by: Brian Gerst -Signed-off-by: Ingo Molnar -Reviewed-by: Ard Biesheuvel -Cc: Linus Torvalds -Link: https://lore.kernel.org/r/20250123190747.745588-4-brgerst@gmail.com -Signed-off-by: Sasha Levin ---- - arch/x86/kernel/Makefile | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile -index f7918980667a3..f42c0903ef86d 100644 ---- a/arch/x86/kernel/Makefile -+++ b/arch/x86/kernel/Makefile -@@ -44,6 +44,8 @@ KCOV_INSTRUMENT_unwind_orc.o := n - KCOV_INSTRUMENT_unwind_frame.o := n - KCOV_INSTRUMENT_unwind_guess.o := n - -+CFLAGS_head32.o := -fno-stack-protector -+CFLAGS_head64.o := -fno-stack-protector - CFLAGS_irq.o := -I $(src)/../include/asm/trace - - obj-y += head_$(BITS).o --- -2.39.5 - diff --git a/queue-6.14/series b/queue-6.14/series index 22aa379e60..a72f0e28d6 100644 --- a/queue-6.14/series +++ b/queue-6.14/series @@ -423,7 +423,6 @@ eth-mlx4-don-t-try-to-complete-xdp-frames-in-netpoll.patch pci-fix-old_size-lower-bound-in-calculate_iosize-too.patch acpi-hed-always-initialize-before-evged.patch vxlan-join-leave-mc-group-after-remote-changes.patch -x86-boot-disable-stack-protector-for-early-boot-code.patch posix-timers-invoke-cond_resched-during-exit_itimers.patch hrtimers-replace-hrtimer_clock_to_base_table-with-sw.patch irqchip-riscv-imsic-set-irq_set_affinity-for-imsic-b.patch diff --git a/queue-6.14/x86-boot-disable-stack-protector-for-early-boot-code.patch b/queue-6.14/x86-boot-disable-stack-protector-for-early-boot-code.patch deleted file mode 100644 index c980cdc4a1..0000000000 --- a/queue-6.14/x86-boot-disable-stack-protector-for-early-boot-code.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 4fef5393716667e290946e84de38b209bda14ad6 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 23 Jan 2025 14:07:35 -0500 -Subject: x86/boot: Disable stack protector for early boot code - -From: Brian Gerst - -[ Upstream commit a9a76b38aaf577887103e3ebb41d70e6aa5a4b19 ] - -On 64-bit, this will prevent crashes when the canary access is changed -from %gs:40 to %gs:__stack_chk_guard(%rip). RIP-relative addresses from -the identity-mapped early boot code will target the wrong address with -zero-based percpu. KASLR could then shift that address to an unmapped -page causing a crash on boot. - -This early boot code runs well before user-space is active and does not -need stack protector enabled. - -Signed-off-by: Brian Gerst -Signed-off-by: Ingo Molnar -Reviewed-by: Ard Biesheuvel -Cc: Linus Torvalds -Link: https://lore.kernel.org/r/20250123190747.745588-4-brgerst@gmail.com -Signed-off-by: Sasha Levin ---- - arch/x86/kernel/Makefile | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile -index b43eb7e384eba..84cfa179802c3 100644 ---- a/arch/x86/kernel/Makefile -+++ b/arch/x86/kernel/Makefile -@@ -44,6 +44,8 @@ KCOV_INSTRUMENT_unwind_orc.o := n - KCOV_INSTRUMENT_unwind_frame.o := n - KCOV_INSTRUMENT_unwind_guess.o := n - -+CFLAGS_head32.o := -fno-stack-protector -+CFLAGS_head64.o := -fno-stack-protector - CFLAGS_irq.o := -I $(src)/../include/asm/trace - - obj-y += head_$(BITS).o --- -2.39.5 -