[openwrt/openwrt] kernel: generic: add missing symbol for arm64 spectre mitigation

LEDE Commits lede-commits at lists.infradead.org
Wed Apr 6 11:07:34 PDT 2022


ynezz pushed a commit to openwrt/openwrt.git, branch openwrt-19.07:
https://git.openwrt.org/26a8be9c9814c1cc89d691332fd0768e5aeba179

commit 26a8be9c9814c1cc89d691332fd0768e5aeba179
Author: Petr Štetiar <ynezz at true.cz>
AuthorDate: Wed Apr 6 19:58:56 2022 +0200

    kernel: generic: add missing symbol for arm64 spectre mitigation
    
    Upstream in commit 3e3904125fcc ("arm64: Mitigate spectre style branch
    history side channels") introduced new config symbol
    MITIGATE_SPECTRE_BRANCH_HISTORY which I missed in commit d39a6c67dcb4
    ("kernel: bump 4.14 to 4.14.275") and buildworkers for arm64 targets
    started complaining:
    
     Mitigate Spectre style attacks against branch history (MITIGATE_SPECTRE_BRANCH_HISTORY) [Y/n/?] (NEW) aborted!
    
    Fixes: d39a6c67dcb4 ("kernel: bump 4.14 to 4.14.275")
    Signed-off-by: Petr Štetiar <ynezz at true.cz>
---
 target/linux/generic/config-4.14 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/target/linux/generic/config-4.14 b/target/linux/generic/config-4.14
index b8a570b9c1..a0569e4eb0 100644
--- a/target/linux/generic/config-4.14
+++ b/target/linux/generic/config-4.14
@@ -2678,6 +2678,7 @@ CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_MISDN_NETJET is not set
 # CONFIG_MISDN_SPEEDFAX is not set
 # CONFIG_MISDN_W6692 is not set
+CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y
 # CONFIG_MKISS is not set
 # CONFIG_MLX4_CORE is not set
 # CONFIG_MLX4_EN is not set




More information about the lede-commits mailing list