UBUNTU: [Config] MITIGATE_SPECTRE_BRANCH_HISTORY=y && HARDEN_BRANCH_HISTORY=y

[mirror_ubuntu-jammy-kernel.git] / debian.master / config / config.common.ubuntu

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index dcaa371d8bee001fb73485d1c502de7a81c0b53c..f2507e5f3e105a38da28acf21af3868c7265036e 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -870,7 +870,7 @@ CONFIG_AS_IS_GNU=y
 CONFIG_AS_SHA1_NI=y
 CONFIG_AS_SHA256_NI=y
 CONFIG_AS_TPAUSE=y
-CONFIG_AS_VERSION=23700
+CONFIG_AS_VERSION=23790
 CONFIG_AS_VFP_VMRS_FPINST=y
 CONFIG_AT76C50X_USB=m
 CONFIG_AT803X_PHY=m
@@ -980,6 +980,7 @@ CONFIG_AUDIT_ARCH=y
 CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
 CONFIG_AUDIT_COMPAT_GENERIC=y
 CONFIG_AUDIT_GENERIC=y
+# CONFIG_AUFS_FS is not set
 CONFIG_AUTO_ZRELADDR=y
 CONFIG_AUXILIARY_BUS=y
 CONFIG_AX25=m
@@ -1518,6 +1519,7 @@ CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 CONFIG_CC_HAS_SANE_STACKPROTECTOR=y
 CONFIG_CC_HAS_SIGN_RETURN_ADDRESS=y
+CONFIG_CC_HAS_UBSAN_BOUNDS=y
 CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
 CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y
 CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y
@@ -2253,6 +2255,7 @@ CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
 CONFIG_CRYPTO_CHACHA20_NEON=m
 CONFIG_CRYPTO_CHACHA20_X86_64=m
+CONFIG_CRYPTO_CHACHA_S390=m
 CONFIG_CRYPTO_CMAC=m
 CONFIG_CRYPTO_CRC32=m
 CONFIG_CRYPTO_CRC32C=y
@@ -2582,8 +2585,8 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y
 CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_INFO_BTF_MODULES=y
 # CONFIG_DEBUG_INFO_COMPRESSED is not set
-CONFIG_DEBUG_INFO_DWARF4=y
-# CONFIG_DEBUG_INFO_DWARF5 is not set
+# CONFIG_DEBUG_INFO_DWARF4 is not set
+CONFIG_DEBUG_INFO_DWARF5=y
 # CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
@@ -3722,6 +3725,7 @@ CONFIG_FPGA_REGION=m
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+# CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FRAME_POINTER=y
 CONFIG_FREEZER=y
@@ -4086,6 +4090,7 @@ CONFIG_HAPPYMEAL=m
 CONFIG_HARDENED_USERCOPY=y
 # CONFIG_HARDENED_USERCOPY_FALLBACK is not set
 # CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
+CONFIG_HARDEN_BRANCH_HISTORY=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HARDLOCKUP_CHECK_TIMESTAMP=y
@@ -4407,7 +4412,6 @@ CONFIG_HIGHMEM=y
 CONFIG_HIGHPTE=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_HINIC=m
-# CONFIG_HIO is not set
 CONFIG_HIP04_ETH=m
 # CONFIG_HIPPI is not set
 CONFIG_HISILICON_ERRATUM_161010101=y
@@ -5613,7 +5617,7 @@ CONFIG_LDISC_AUTOLOAD=y
 # CONFIG_LD_HEAD_STUB_CATCH is not set
 CONFIG_LD_IS_BFD=y
 CONFIG_LD_ORPHAN_WARN=y
-CONFIG_LD_VERSION=23700
+CONFIG_LD_VERSION=23790
 CONFIG_LEDS_88PM860X=m
 CONFIG_LEDS_AAEON=m
 CONFIG_LEDS_AAT1290=m
@@ -5787,7 +5791,7 @@ CONFIG_LPARCFG=y
 # CONFIG_LP_CONSOLE is not set
 CONFIG_LRU_CACHE=m
 CONFIG_LSI_ET1011C_PHY=m
-CONFIG_LSM="lockdown,yama,integrity,apparmor"
+CONFIG_LSM="landlock,lockdown,yama,integrity,apparmor"
 CONFIG_LSM_MMAP_MIN_ADDR=0
 CONFIG_LS_EXTIRQ=y
 CONFIG_LS_SCFG_MSI=y
@@ -6206,6 +6210,7 @@ CONFIG_MISDN_L1OIP=m
 CONFIG_MISDN_NETJET=m
 CONFIG_MISDN_SPEEDFAX=m
 CONFIG_MISDN_W6692=m
+CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y
 # CONFIG_MK8 is not set
 CONFIG_MKISS=m
 CONFIG_MLX4_CORE=m
@@ -7322,6 +7327,7 @@ CONFIG_NVEC_PAZ00=m
 CONFIG_NVEC_POWER=m
 # CONFIG_NVHE_EL2_DEBUG is not set
 CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y
+CONFIG_NVIDIA_WMI_EC_BACKLIGHT=m
 CONFIG_NVMEM_BCM_OCOTP=m
 CONFIG_NVMEM_IMX_IIM=m
 CONFIG_NVMEM_IMX_OCOTP=m
@@ -7376,7 +7382,6 @@ CONFIG_OF_IOMMU=y
 CONFIG_OF_IRQ=y
 CONFIG_OF_KOBJ=y
 CONFIG_OF_MDIO=y
-CONFIG_OF_NET=y
 CONFIG_OF_NUMA=y
 CONFIG_OF_OVERLAY=y
 CONFIG_OF_PMEM=m
@@ -7463,6 +7468,7 @@ CONFIG_PAGE_POOL=y
 CONFIG_PAGE_REPORTING=y
 CONFIG_PAGE_TABLE_ISOLATION=y
 CONFIG_PAHOLE_HAS_SPLIT_BTF=y
+CONFIG_PAHOLE_VERSION=122
 CONFIG_PALMAS_GPADC=m
 CONFIG_PANASONIC_LAPTOP=m
 CONFIG_PANEL=m
@@ -8475,7 +8481,7 @@ CONFIG_QED_SRIOV=y
 CONFIG_QETH=m
 CONFIG_QETH_L2=m
 CONFIG_QETH_L3=m
-CONFIG_QETH_OSX=y
+# CONFIG_QETH_OSX is not set
 CONFIG_QE_GPIO=y
 CONFIG_QE_TDM=y
 CONFIG_QE_USB=y
@@ -9739,7 +9745,8 @@ CONFIG_SGI_XP=m
 CONFIG_SGL_ALLOC=y
 CONFIG_SG_POOL=y
 CONFIG_SG_SPLIT=y
-# CONFIG_SHIFT_FS is not set
+CONFIG_SHIFT_FS=m
+CONFIG_SHIFT_FS_POSIX_ACL=y
 CONFIG_SHMEM=y
 CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
 CONFIG_SH_ETH=m
@@ -11049,6 +11056,7 @@ CONFIG_TEST_POWER=m
 # CONFIG_TEST_STRING_HELPERS is not set
 # CONFIG_TEST_STRSCPY is not set
 # CONFIG_TEST_SYSCTL is not set
+# CONFIG_TEST_UBSAN is not set
 # CONFIG_TEST_UDELAY is not set
 # CONFIG_TEST_USER_COPY is not set
 # CONFIG_TEST_UUID is not set
@@ -11400,7 +11408,17 @@ CONFIG_UBIFS_FS_SECURITY=y
 CONFIG_UBIFS_FS_XATTR=y
 CONFIG_UBIFS_FS_ZLIB=y
 CONFIG_UBIFS_FS_ZSTD=y
-# CONFIG_UBSAN is not set
+CONFIG_UBSAN=y
+# CONFIG_UBSAN_ALIGNMENT is not set
+CONFIG_UBSAN_BOOL=y
+CONFIG_UBSAN_BOUNDS=y
+# CONFIG_UBSAN_DIV_ZERO is not set
+CONFIG_UBSAN_ENUM=y
+CONFIG_UBSAN_ONLY_BOUNDS=y
+CONFIG_UBSAN_SANITIZE_ALL=y
+CONFIG_UBSAN_SHIFT=y
+# CONFIG_UBSAN_TRAP is not set
+# CONFIG_UBSAN_UNREACHABLE is not set
 CONFIG_UBUNTU_HOST=m
 CONFIG_UBUNTU_ODM_DRIVERS=y
 CONFIG_UCB1400_CORE=m
@@ -12576,7 +12594,6 @@ CONFIG_X86_PCC_CPUFREQ=y
 CONFIG_X86_PKG_TEMP_THERMAL=m
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_X86_PLATFORM_DRIVERS_DELL=y
-CONFIG_X86_PLATFORM_DRIVERS_INTEL=y
 CONFIG_X86_PMEM_LEGACY=y
 CONFIG_X86_PMEM_LEGACY_DEVICE=y
 CONFIG_X86_PM_TIMER=y