Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions arch/x86/configs/common.fragment
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,14 @@ CONFIG_SYSTEM_REVOCATION_LIST=y
# Was commit e76c6e90a73f.
# CONFIG_BPF_KPROBE_OVERRIDE is not set

# No IMA on any flavour. EVE loads no IMA policy and nothing reads the
# measurement list, yet on a Secure Boot host IMA_ARCH_POLICY still installs
# rules that measure every module and kexec load into PCR 10. core and rt
# never enabled it; hwe and ai inherited it from the Ubuntu derivation. EVM
# only protects the xattrs IMA appraisal checks, so it goes with it.
# CONFIG_IMA is not set
# CONFIG_EVM is not set

# Hardware/driver exclusions.
# INTEL_PCH_THERMAL: disabled, honouring ef7ccc4d151c on the 6.12 branch
# which turned this driver off deliberately. Was commit bf841829cf73.
Expand Down
14 changes: 5 additions & 9 deletions arch/x86/configs/eve-hwe_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -2243,6 +2243,8 @@ CONFIG_APPLICOM=m
CONFIG_MWAVE=m
CONFIG_HPET=y
CONFIG_HANGCHECK_TIMER=m
CONFIG_TCG_TPM=y
CONFIG_TCG_TIS=y
CONFIG_TCG_TIS_SPI=m
CONFIG_TCG_TIS_SPI_CR50=y
CONFIG_TCG_TIS_I2C=m
Expand All @@ -2253,6 +2255,7 @@ CONFIG_TCG_TIS_I2C_NUVOTON=m
CONFIG_TCG_NSC=m
CONFIG_TCG_ATMEL=m
CONFIG_TCG_INFINEON=m
CONFIG_TCG_CRB=y
CONFIG_TCG_VTPM_PROXY=m
CONFIG_TCG_SVSM=m
CONFIG_TCG_TIS_ST33ZP24_I2C=m
Expand Down Expand Up @@ -6135,6 +6138,7 @@ CONFIG_KEYS_REQUEST_CACHE=y
CONFIG_PERSISTENT_KEYRINGS=y
CONFIG_BIG_KEYS=y
CONFIG_TRUSTED_KEYS=y
CONFIG_ENCRYPTED_KEYS=y
CONFIG_USER_DECRYPTED_DATA=y
CONFIG_KEY_DH_OPERATIONS=y
CONFIG_KEY_NOTIFICATIONS=y
Expand All @@ -6161,15 +6165,6 @@ CONFIG_INTEGRITY_SIGNATURE=y
CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
CONFIG_INTEGRITY_PLATFORM_KEYRING=y
CONFIG_INTEGRITY_MACHINE_KEYRING=y
CONFIG_IMA=y
CONFIG_IMA_KEXEC=y
CONFIG_IMA_DEFAULT_HASH_SHA256=y
CONFIG_IMA_APPRAISE=y
CONFIG_IMA_ARCH_POLICY=y
CONFIG_IMA_APPRAISE_MODSIG=y
CONFIG_EVM=y
CONFIG_EVM_EXTRA_SMACK_XATTRS=y
CONFIG_EVM_ADD_XATTRS=y
CONFIG_DEFAULT_SECURITY_APPARMOR=y
CONFIG_LSM="landlock,lockdown,yama,integrity,apparmor"
CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
Expand All @@ -6195,6 +6190,7 @@ CONFIG_CRYPTO_GCM=y
CONFIG_CRYPTO_SEQIV=y
CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_RMD160=m
CONFIG_CRYPTO_SHA1=y
CONFIG_CRYPTO_SM3_GENERIC=m
CONFIG_CRYPTO_WP512=m
CONFIG_CRYPTO_XCBC=m
Expand Down