X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=kconfig_hardened_check%2F__init__.py;h=a926402426c3eba4ba100a9fb0f17b4a81d4bcfa;hb=3f57717b4ec311b04fbc658616f835f1f3abbf51;hp=0467a1498f90e96443ea319a3b5352320eb254cf;hpb=56928f27dfcefe8688a2ab563e48b4f2e3564d0d;p=kconfig-hardened-check.git diff --git a/kconfig_hardened_check/__init__.py b/kconfig_hardened_check/__init__.py index 0467a14..a926402 100644 --- a/kconfig_hardened_check/__init__.py +++ b/kconfig_hardened_check/__init__.py @@ -16,7 +16,6 @@ # Mitigations of CPU vulnerabilities: # Аrch-independent: # X86: -# l1tf=full,force # l1d_flush=on (a part of the l1tf option) # mds=full,nosmt # tsx=off @@ -740,6 +739,8 @@ def add_cmdline_checks(l, arch): CmdlineCheck('self_protection', 'defconfig', 'spectre_v2_user', 'is not set'))] l += [OR(CmdlineCheck('self_protection', 'defconfig', 'spec_store_bypass_disable', 'is not off'), CmdlineCheck('self_protection', 'defconfig', 'spec_store_bypass_disable', 'is not set'))] + l += [OR(CmdlineCheck('self_protection', 'defconfig', 'l1tf', 'is not off'), + CmdlineCheck('self_protection', 'defconfig', 'l1tf', 'is not set'))] if arch == 'ARM64': l += [OR(CmdlineCheck('self_protection', 'defconfig', 'rodata', 'full'), AND(KconfigCheck('self_protection', 'defconfig', 'RODATA_FULL_DEFAULT_ENABLED', 'y'), @@ -960,6 +961,9 @@ def normalize_cmdline_options(option, value): if option == 'spec_store_bypass_disable': # See ssb_parse_cmdline() in arch/x86/kernel/cpu/bugs.c return value + if option == 'l1tf': + # See l1tf_cmdline() in arch/x86/kernel/cpu/bugs.c + return value # Implement a limited part of the kstrtobool() logic if value in ('1', 'on', 'On', 'ON', 'y', 'Y', 'yes', 'Yes', 'YES'):