summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Tintel <stijn@linux-ipv6.be>2018-07-31 12:19:18 +0300
committerJohn Crispin <john@phrozen.org>2018-08-06 09:17:31 +0200
commit6c075777d5afdeef7516e5125526b3f2c406f453 (patch)
treec3b8b4e79860532804db125bcbf633f5614d61bb
parentb40316c21a960d332bc9b04ee1791b8aafcf8786 (diff)
downloadmtk-20170518-6c075777d5afdeef7516e5125526b3f2c406f453.zip
mtk-20170518-6c075777d5afdeef7516e5125526b3f2c406f453.tar.gz
mtk-20170518-6c075777d5afdeef7516e5125526b3f2c406f453.tar.bz2
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 <stijn@linux-ipv6.be> (cherry picked from commit 77e3e706ce0dfe653a28e088bdcf0acddead0091)
-rw-r--r--target/linux/armvirt/64/config-default1
-rw-r--r--target/linux/mediatek/mt7622/config-4.141
-rw-r--r--target/linux/mvebu/cortexa53/config-default1
-rw-r--r--target/linux/mvebu/cortexa72/config-default1
-rw-r--r--target/linux/octeontx/config-4.141
-rw-r--r--target/linux/sunxi/cortexa53/config-default1
6 files changed, 6 insertions, 0 deletions
diff --git a/target/linux/armvirt/64/config-default b/target/linux/armvirt/64/config-default
index 0045651..a38a916 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 e76b8c4..fdfb68d 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 4c0ced3..b631c30 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 3c2b2b0..50b8d21 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 cedd6db..fd627d6 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 2d9dd01..b1702bc 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