From 77e3e706ce0dfe653a28e088bdcf0acddead0091 Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Tue, 31 Jul 2018 12:19:18 +0300 Subject: [PATCH] kernel: add missing ARM64_SSBD symbol In 4.14.57, a new symbol for Spectre v4 mitigation was introduced for ARM64. Add this symbol to all ARM64 targets using kernel 4.14. This mitigates CVE-2018-3639 on ARM64. Signed-off-by: Stijn Tintel --- target/linux/armvirt/64/config-default | 1 + target/linux/mediatek/mt7622/config-4.14 | 1 + target/linux/mvebu/cortexa53/config-default | 1 + target/linux/mvebu/cortexa72/config-default | 1 + target/linux/octeontx/config-4.14 | 1 + target/linux/sunxi/cortexa53/config-default | 1 + 6 files changed, 6 insertions(+) diff --git a/target/linux/armvirt/64/config-default b/target/linux/armvirt/64/config-default index 0045651333..a38a9162b6 100644 --- a/target/linux/armvirt/64/config-default +++ b/target/linux/armvirt/64/config-default @@ -42,6 +42,7 @@ CONFIG_ARM64_PAN=y # CONFIG_ARM64_PTDUMP is not set # CONFIG_ARM64_PTDUMP_DEBUGFS is not set # CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET is not set +CONFIG_ARM64_SSBD=y # CONFIG_ARM64_SW_TTBR0_PAN is not set CONFIG_ARM64_UAO=y CONFIG_ARM64_VA_BITS=39 diff --git a/target/linux/mediatek/mt7622/config-4.14 b/target/linux/mediatek/mt7622/config-4.14 index 15cd47a4ae..86951e198a 100644 --- a/target/linux/mediatek/mt7622/config-4.14 +++ b/target/linux/mediatek/mt7622/config-4.14 @@ -52,6 +52,7 @@ CONFIG_ARM64_PAN=y # CONFIG_ARM64_PTDUMP_CORE is not set # CONFIG_ARM64_PTDUMP_DEBUGFS is not set # CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET is not set +CONFIG_ARM64_SSBD=y # CONFIG_ARM64_SW_TTBR0_PAN is not set CONFIG_ARM64_UAO=y CONFIG_ARM64_VA_BITS=39 diff --git a/target/linux/mvebu/cortexa53/config-default b/target/linux/mvebu/cortexa53/config-default index 4c0ced320d..b631c30f5f 100644 --- a/target/linux/mvebu/cortexa53/config-default +++ b/target/linux/mvebu/cortexa53/config-default @@ -36,6 +36,7 @@ CONFIG_ARM64_PAGE_SHIFT=12 # CONFIG_ARM64_PTDUMP_CORE is not set # CONFIG_ARM64_PTDUMP_DEBUGFS is not set # CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET is not set +CONFIG_ARM64_SSBD=y # CONFIG_ARM64_SW_TTBR0_PAN is not set # CONFIG_ARM64_UAO is not set CONFIG_ARM64_VA_BITS=39 diff --git a/target/linux/mvebu/cortexa72/config-default b/target/linux/mvebu/cortexa72/config-default index 3c2b2b0446..50b8d21c32 100644 --- a/target/linux/mvebu/cortexa72/config-default +++ b/target/linux/mvebu/cortexa72/config-default @@ -36,6 +36,7 @@ CONFIG_ARM64_PAGE_SHIFT=12 # CONFIG_ARM64_PTDUMP_CORE is not set # CONFIG_ARM64_PTDUMP_DEBUGFS is not set # CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET is not set +CONFIG_ARM64_SSBD=y # CONFIG_ARM64_SW_TTBR0_PAN is not set # CONFIG_ARM64_UAO is not set CONFIG_ARM64_VA_BITS=39 diff --git a/target/linux/octeontx/config-4.14 b/target/linux/octeontx/config-4.14 index cedd6dbd80..fd627d6a26 100644 --- a/target/linux/octeontx/config-4.14 +++ b/target/linux/octeontx/config-4.14 @@ -54,6 +54,7 @@ CONFIG_ARM64_PAN=y # CONFIG_ARM64_PTDUMP_CORE is not set # CONFIG_ARM64_PTDUMP_DEBUGFS is not set # CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET is not set +CONFIG_ARM64_SSBD=y # CONFIG_ARM64_SW_TTBR0_PAN is not set CONFIG_ARM64_UAO=y CONFIG_ARM64_VA_BITS=48 diff --git a/target/linux/sunxi/cortexa53/config-default b/target/linux/sunxi/cortexa53/config-default index 2d9dd0191a..b1702bc3c2 100644 --- a/target/linux/sunxi/cortexa53/config-default +++ b/target/linux/sunxi/cortexa53/config-default @@ -35,6 +35,7 @@ CONFIG_ARM64_PAGE_SHIFT=12 # CONFIG_ARM64_PTDUMP_CORE is not set # CONFIG_ARM64_PTDUMP_DEBUGFS is not set # CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET is not set +CONFIG_ARM64_SSBD=y # CONFIG_ARM64_SW_TTBR0_PAN is not set # CONFIG_ARM64_UAO is not set CONFIG_ARM64_VA_BITS=39 -- 2.30.2