Commit 56928f27 by Alexander Popov

Add the spectre_v2_user check

parent da0a0f7c
...@@ -736,6 +736,8 @@ def add_cmdline_checks(l, arch): ...@@ -736,6 +736,8 @@ def add_cmdline_checks(l, arch):
CmdlineCheck('self_protection', 'defconfig', 'mitigations', 'is not set'))] CmdlineCheck('self_protection', 'defconfig', 'mitigations', 'is not set'))]
l += [OR(CmdlineCheck('self_protection', 'defconfig', 'spectre_v2', 'is not off'), l += [OR(CmdlineCheck('self_protection', 'defconfig', 'spectre_v2', 'is not off'),
CmdlineCheck('self_protection', 'defconfig', 'spectre_v2', 'is not set'))] CmdlineCheck('self_protection', 'defconfig', 'spectre_v2', 'is not set'))]
l += [OR(CmdlineCheck('self_protection', 'defconfig', 'spectre_v2_user', 'is not off'),
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'))]
if arch == 'ARM64': if arch == 'ARM64':
...@@ -952,6 +954,9 @@ def normalize_cmdline_options(option, value): ...@@ -952,6 +954,9 @@ def normalize_cmdline_options(option, value):
if option == 'spectre_v2': if option == 'spectre_v2':
# See spectre_v2_parse_cmdline() in arch/x86/kernel/cpu/bugs.c # See spectre_v2_parse_cmdline() in arch/x86/kernel/cpu/bugs.c
return value return value
if option == 'spectre_v2_user':
# See spectre_v2_parse_user_cmdline() in arch/x86/kernel/cpu/bugs.c
return 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
......
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