Commit 3f57717b by Alexander Popov

Add the l1tf check

parent 56928f27
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
# Mitigations of CPU vulnerabilities: # Mitigations of CPU vulnerabilities:
# Аrch-independent: # Аrch-independent:
# X86: # X86:
# l1tf=full,force
# l1d_flush=on (a part of the l1tf option) # l1d_flush=on (a part of the l1tf option)
# mds=full,nosmt # mds=full,nosmt
# tsx=off # tsx=off
...@@ -740,6 +739,8 @@ def add_cmdline_checks(l, arch): ...@@ -740,6 +739,8 @@ def add_cmdline_checks(l, arch):
CmdlineCheck('self_protection', 'defconfig', 'spectre_v2_user', 'is not set'))] CmdlineCheck('self_protection', 'defconfig', 'spectre_v2_user', 'is not set'))]
l += [OR(CmdlineCheck('self_protection', 'defconfig', 'spec_store_bypass_disable', 'is not off'), l += [OR(CmdlineCheck('self_protection', 'defconfig', 'spec_store_bypass_disable', 'is not off'),
CmdlineCheck('self_protection', 'defconfig', 'spec_store_bypass_disable', 'is not set'))] 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': if arch == 'ARM64':
l += [OR(CmdlineCheck('self_protection', 'defconfig', 'rodata', 'full'), l += [OR(CmdlineCheck('self_protection', 'defconfig', 'rodata', 'full'),
AND(KconfigCheck('self_protection', 'defconfig', 'RODATA_FULL_DEFAULT_ENABLED', 'y'), AND(KconfigCheck('self_protection', 'defconfig', 'RODATA_FULL_DEFAULT_ENABLED', 'y'),
...@@ -960,6 +961,9 @@ def normalize_cmdline_options(option, value): ...@@ -960,6 +961,9 @@ def normalize_cmdline_options(option, value):
if option == 'spec_store_bypass_disable': if option == 'spec_store_bypass_disable':
# See ssb_parse_cmdline() in arch/x86/kernel/cpu/bugs.c # See ssb_parse_cmdline() in arch/x86/kernel/cpu/bugs.c
return value 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 # Implement a limited part of the kstrtobool() logic
if value in ('1', 'on', 'On', 'ON', 'y', 'Y', 'yes', 'Yes', 'YES'): if value in ('1', 'on', 'On', 'ON', 'y', 'Y', 'yes', 'Yes', 'YES'):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment