proj/linux-patches:6.6 commit in: /
"Mike Pagano" <[email protected]>
| Newsgroups | gmane.linux.gentoo.cvs |
|---|---|
| Message-ID | <1786105269.acce594c64f723f3a186689945293d5f4cf66aff.mpagano@gentoo> |
commit: acce594c64f723f3a186689945293d5f4cf66aff Author: Mike Pagano <mpagano <AT> gentoo <DOT> org> AuthorDate: Fri Aug 7 12:21:09 2026 +0000 Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org> CommitDate: Fri Aug 7 12:21:09 2026 +0000 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=acce594c Linux patch 6.6.150 Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org> 0000_README | 4 ++++ 1149_linux-6.6.150.patch | 62 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) diff --git a/0000_README b/0000_README index cda000b0..4004ba0f 100644 --- a/0000_README +++ b/0000_README @@ -639,6 +639,10 @@ Patch: 1148_linux-6.6.149.patch From: https://www.kernel.org Desc: Linux 6.6.149 +Patch: 1149_linux-6.6.150.patch +From: https://www.kernel.org +Desc: Linux 6.6.150 + Patch: 1510_fs-enable-link-security-restrictions-by-default.patch From: http://sources.debian.net/src/linux/3.16.7-ckt4-3/debian/patches/debian/fs-enable-link-security-restrictions-by-default.patch Desc: Enable link security restrictions by default. diff --git a/1149_linux-6.6.150.patch b/1149_linux-6.6.150.patch new file mode 100644 index 00000000..81fa0b4b --- /dev/null +++ b/1149_linux-6.6.150.patch @@ -0,0 +1,62 @@ +diff --git a/Makefile b/Makefile +index f64070d333e23d..c05bee52eb2048 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,7 +1,7 @@ + # SPDX-License-Identifier: GPL-2.0 + VERSION = 6 + PATCHLEVEL = 6 +-SUBLEVEL = 149 ++SUBLEVEL = 150 + EXTRAVERSION = + NAME = Pinguïn Aangedreven + +diff --git a/arch/x86/include/asm/nospec-branch.h b/arch/x86/include/asm/nospec-branch.h +index 43a2daeef5efd1..9a1531a43ce1d4 100644 +--- a/arch/x86/include/asm/nospec-branch.h ++++ b/arch/x86/include/asm/nospec-branch.h +@@ -219,11 +219,14 @@ + * The LFENCE fixes this by ensuring step 5 is never reached speculatively. + * Note that this LFENCE only occurs if safe-RET was actually interrupted (so + * it's outside of the normal path). ++ * ++ * (The 128 below is RIP offset, used as a naked number here for ease of ++ * backporting). + */ + #define __HANDLE_INTR_SAFERET(name, pt_regs) \ +- cmpq $(name), RIP+pt_regs; \ ++ cmpq $(name), 128+pt_regs; \ + jb 1f; \ +- cmpq $(name)+5, RIP+pt_regs; \ ++ cmpq $(name)+5, 128+pt_regs; \ + ja 1f; \ + lfence; \ + leaq pt_regs, %rdi; \ +@@ -360,7 +363,7 @@ + __UNTRAIN_RET X86_FEATURE_ENTRY_IBPB, __stringify(RESET_CALL_DEPTH_FROM_CALL) + + .macro HANDLE_INTR_SAFERET pt_regs +-#ifdef CONFIG_MITIGATION_SRSO ++#ifdef CONFIG_CPU_SRSO + ALTERNATIVE_2 "", \ + __stringify(__HANDLE_INTR_SAFERET(srso_safe_ret, \pt_regs)), X86_FEATURE_SRSO, \ + __stringify(__HANDLE_INTR_SAFERET(srso_alias_safe_ret, \pt_regs)), X86_FEATURE_SRSO_ALIAS +diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c +index bf57acd4218693..72de35d67bc7c5 100644 +--- a/arch/x86/kernel/cpu/bugs.c ++++ b/arch/x86/kernel/cpu/bugs.c +@@ -3490,7 +3490,7 @@ ssize_t cpu_show_vmscape(struct device *dev, struct device_attribute *attr, char + } + #endif + +-#ifdef CONFIG_MITIGATION_SRSO ++#ifdef CONFIG_CPU_SRSO + /* + * Called during exception/interrupt entry if interrupted during the + * safe-RET sequence. The safe-RET sequence consists of 3 instructions: +@@ -3527,4 +3527,4 @@ void noinstr handle_interrupted_saferet(struct pt_regs *regs) + /* 2. Pop rIP off the stack: */ + regs->sp += 8; + } +-#endif /* CONFIG_MITIGATION_SRSO */ ++#endif /* CONFIG_CPU_SRSO */