Commit a637a660 by Alexander Popov

No, the 'page_alloc.shuffle' should be set anyway

parent 1a5aaa7a
...@@ -698,10 +698,7 @@ def add_cmdline_checks(l, arch): ...@@ -698,10 +698,7 @@ def add_cmdline_checks(l, arch):
CmdlineCheck('self_protection', 'kspp', 'hardened_usercopy', 'is not set')))] CmdlineCheck('self_protection', 'kspp', 'hardened_usercopy', 'is not set')))]
l += [OR(CmdlineCheck('self_protection', 'kspp', 'slab_common.usercopy_fallback', '0'), l += [OR(CmdlineCheck('self_protection', 'kspp', 'slab_common.usercopy_fallback', '0'),
AND(KconfigCheck('self_protection', 'kspp', 'HARDENED_USERCOPY_FALLBACK', 'is not set'), AND(KconfigCheck('self_protection', 'kspp', 'HARDENED_USERCOPY_FALLBACK', 'is not set'),
CmdlineCheck('self_protection', 'kspp', 'slab_common.usercopy_fallback', 'is not set')))] CmdlineCheck('self_protection', 'kspp', 'slab_common.usercopy_fallback', 'is not set')))] # ... the end
l += [OR(CmdlineCheck('self_protection', 'kspp', 'page_alloc.shuffle', '1'),
AND(KconfigCheck('self_protection', 'kspp', 'SHUFFLE_PAGE_ALLOCATOR', 'y'),
CmdlineCheck('self_protection', 'kspp', 'page_alloc.shuffle', 'is not set')))] # ... the end
if arch in ('X86_64', 'ARM64', 'X86_32'): if arch in ('X86_64', 'ARM64', 'X86_32'):
l += [OR(CmdlineCheck('self_protection', 'kspp', 'randomize_kstack_offset', '1'), l += [OR(CmdlineCheck('self_protection', 'kspp', 'randomize_kstack_offset', '1'),
AND(KconfigCheck('self_protection', 'kspp', 'RANDOMIZE_KSTACK_OFFSET_DEFAULT', 'y'), AND(KconfigCheck('self_protection', 'kspp', 'RANDOMIZE_KSTACK_OFFSET_DEFAULT', 'y'),
...@@ -709,6 +706,9 @@ def add_cmdline_checks(l, arch): ...@@ -709,6 +706,9 @@ def add_cmdline_checks(l, arch):
if arch in ('X86_64', 'X86_32'): if arch in ('X86_64', 'X86_32'):
l += [CmdlineCheck('self_protection', 'kspp', 'pti', 'on')] l += [CmdlineCheck('self_protection', 'kspp', 'pti', 'on')]
# 'self_protection', 'clipos'
l += [CmdlineCheck('self_protection', 'clipos', 'page_alloc.shuffle', '1')]
# 'cut_attack_surface', 'kspp' # 'cut_attack_surface', 'kspp'
if arch == 'X86_64': if arch == 'X86_64':
l += [OR(CmdlineCheck('cut_attack_surface', 'kspp', 'vsyscall', 'none'), l += [OR(CmdlineCheck('cut_attack_surface', 'kspp', 'vsyscall', 'none'),
......
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