Skip to content

K
kernel-hardening-checker
Commit 7235769c by Alexander Popov
Options

Fix the order in the vdso32 check

parent e2c996e9
Showing with 5 additions and 5 deletions
kernel_hardening_checker/checks.py
...@@ -544,14 +544,14 @@ def add_cmdline_checks(l, arch): ...@@ -544,14 +544,14 @@ def add_cmdline_checks(l, arch):
KconfigCheck('cut_attack_surface', 'kspp', 'X86_VSYSCALL_EMULATION', 'is not set'), KconfigCheck('cut_attack_surface', 'kspp', 'X86_VSYSCALL_EMULATION', 'is not set'),
AND(KconfigCheck('cut_attack_surface', 'kspp', 'LEGACY_VSYSCALL_NONE', 'y'), AND(KconfigCheck('cut_attack_surface', 'kspp', 'LEGACY_VSYSCALL_NONE', 'y'),
CmdlineCheck('cut_attack_surface', 'kspp', 'vsyscall', 'is not set')))] CmdlineCheck('cut_attack_surface', 'kspp', 'vsyscall', 'is not set')))]
l += [OR(CmdlineCheck('cut_attack_surface', 'my', 'vdso32', '1'), l += [OR(CmdlineCheck('cut_attack_surface', 'kspp', 'vdso32', '0'),
CmdlineCheck('cut_attack_surface', 'kspp', 'vdso32', '0'), CmdlineCheck('cut_attack_surface', 'my', 'vdso32', '1'),
AND(KconfigCheck('cut_attack_surface', 'kspp', 'COMPAT_VDSO', 'is not set'), AND(KconfigCheck('cut_attack_surface', 'kspp', 'COMPAT_VDSO', 'is not set'),
CmdlineCheck('cut_attack_surface', 'my', 'vdso32', 'is not set')))] # the vdso32 parameter must not be 2 CmdlineCheck('cut_attack_surface', 'my', 'vdso32', 'is not set')))] # the vdso32 parameter must not be 2
if arch == 'X86_32': if arch == 'X86_32':
l += [OR(CmdlineCheck('cut_attack_surface', 'my', 'vdso32', '1'), l += [OR(CmdlineCheck('cut_attack_surface', 'kspp', 'vdso32', '0'),
CmdlineCheck('cut_attack_surface', 'my', 'vdso', '1'), CmdlineCheck('cut_attack_surface', 'my', 'vdso', '0'),
CmdlineCheck('cut_attack_surface', 'kspp', 'vdso32', '0'), CmdlineCheck('cut_attack_surface', 'my', 'vdso32', '1'),
CmdlineCheck('cut_attack_surface', 'my', 'vdso', '0'), CmdlineCheck('cut_attack_surface', 'my', 'vdso', '0'),
AND(KconfigCheck('cut_attack_surface', 'kspp', 'COMPAT_VDSO', 'is not set'), AND(KconfigCheck('cut_attack_surface', 'kspp', 'COMPAT_VDSO', 'is not set'),
CmdlineCheck('cut_attack_surface', 'my', 'vdso32', 'is not set'), CmdlineCheck('cut_attack_surface', 'my', 'vdso32', 'is not set'),
......
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