UBUNTU: [Config]: Enable speculation mitigations

CVE-2022-29900
CVE-2022-29901
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 81c6ac40d2cee8865045529f55db23777ceaebc6..eedf7214874e86fbf4a9bcafdd60fda04e0a7859 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1517,9 +1517,11 @@ CONFIG_CC_HAS_INT128=y
 CONFIG_CC_HAS_KASAN_GENERIC=y
 CONFIG_CC_HAS_KASAN_SW_TAGS=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
+CONFIG_CC_HAS_RETURN_THUNK=y
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 CONFIG_CC_HAS_SANE_STACKPROTECTOR=y
 CONFIG_CC_HAS_SIGN_RETURN_ADDRESS=y
+CONFIG_CC_HAS_SLS=y
 CONFIG_CC_HAS_UBSAN_BOUNDS=y
 CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
 CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y
@@ -2137,6 +2139,8 @@ CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_FREQ_THERMAL=y
 CONFIG_CPU_HAS_ASID=y
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
+CONFIG_CPU_IBPB_ENTRY=y
+CONFIG_CPU_IBRS_ENTRY=y
 # CONFIG_CPU_ICACHE_DISABLE is not set
 CONFIG_CPU_ICACHE_MISMATCH_WORKAROUND=y
 CONFIG_CPU_IDLE=y
@@ -2163,6 +2167,7 @@ CONFIG_CPU_SW_DOMAIN_PAN=y
 CONFIG_CPU_THERMAL=y
 CONFIG_CPU_THUMB_CAPABLE=y
 CONFIG_CPU_TLB_V7=y
+CONFIG_CPU_UNRET_ENTRY=y
 CONFIG_CPU_V7=y
 CONFIG_CRAMFS_BLOCKDEV=y
 CONFIG_CRAMFS_MTD=y
@@ -8816,6 +8821,7 @@ CONFIG_RESET_TI_SCI=m
 CONFIG_RESET_TI_SYSCON=m
 CONFIG_RESET_UNIPHIER=m
 CONFIG_RESET_UNIPHIER_GLUE=m
+CONFIG_RETHUNK=y
 CONFIG_RETPOLINE=y
 CONFIG_RETU_WATCHDOG=m
 CONFIG_RFD77402=m
@@ -9794,6 +9800,7 @@ CONFIG_SLIP_COMPRESSED=y
 CONFIG_SLIP_MODE_SLIP6=y
 CONFIG_SLIP_SMART=y
 # CONFIG_SLOB is not set
+CONFIG_SLS=y
 CONFIG_SLUB=y
 CONFIG_SLUB_CPU_PARTIAL=y
 CONFIG_SLUB_DEBUG=y
@@ -10654,6 +10661,7 @@ CONFIG_SPEAKUP_SYNTH_LTLK=m
 CONFIG_SPEAKUP_SYNTH_SOFT=m
 CONFIG_SPEAKUP_SYNTH_SPKOUT=m
 CONFIG_SPEAKUP_SYNTH_TXPRT=m
+CONFIG_SPECULATION_MITIGATIONS=y
 CONFIG_SPI_ALTERA=m
 CONFIG_SPI_ALTERA_CORE=m
 CONFIG_SPI_ALTERA_DFL=m