From: Eneas U de Queiroz Date: Wed, 6 Sep 2023 17:20:53 +0000 (-0300) Subject: Skip kexec_load_disabled if KEXEC_CORE is not set X-Git-Tag: v0.6.10~73^2~9 X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=ce0afbc572d36c842891bd717bb462fce41f5e10;p=kconfig-hardened-check.git Skip kexec_load_disabled if KEXEC_CORE is not set Signed-off-by: Eneas U de Queiroz --- diff --git a/kernel_hardening_checker/checks.py b/kernel_hardening_checker/checks.py index ed83541..fa5c08a 100644 --- a/kernel_hardening_checker/checks.py +++ b/kernel_hardening_checker/checks.py @@ -663,14 +663,17 @@ def add_sysctl_checks(l, _arch): # Calling the SysctlCheck class constructor: # SysctlCheck(reason, decision, name, expected) + # use an omnipresent config symbol to see if we have a config file + have_config_file = KconfigCheck('-', '-', 'DEFAULT_INIT', 'is present') l += [OR(SysctlCheck('self_protection', 'kspp', 'net.core.bpf_jit_harden', '2'), AND(KconfigCheck('cut_attack_surface', 'kspp', 'BPF_JIT', 'is not set'), - # use an omnipresent config symbol to see if we have a config file to check BPF_JIT. - KconfigCheck('cut_attack_surface', 'kspp', 'DEFAULT_INIT', 'is present')))] + have_config_file))] l += [SysctlCheck('cut_attack_surface', 'kspp', 'kernel.dmesg_restrict', '1')] l += [SysctlCheck('cut_attack_surface', 'kspp', 'kernel.perf_event_paranoid', '3')] # with a custom patch, see https://lwn.net/Articles/696216/ - l += [SysctlCheck('cut_attack_surface', 'kspp', 'kernel.kexec_load_disabled', '1')] + l += [OR(SysctlCheck('cut_attack_surface', 'kspp', 'kernel.kexec_load_disabled', '1'), + AND(KconfigCheck('cut_attack_surfice', 'kspp', 'KEXEC_CORE', 'is not set'), + have_config_file))] l += [SysctlCheck('cut_attack_surface', 'kspp', 'user.max_user_namespaces', '0')] # may break the upower daemon in Ubuntu l += [SysctlCheck('cut_attack_surface', 'kspp', 'dev.tty.ldisc_autoload', '0')] l += [SysctlCheck('cut_attack_surface', 'kspp', 'kernel.unprivileged_bpf_disabled', '1')]