projects
/
kconfig-hardened-check.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add more precise typing for checklist: List[ChecklistObjType]
[kconfig-hardened-check.git]
/
kernel_hardening_checker
/
checks.py
diff --git
a/kernel_hardening_checker/checks.py
b/kernel_hardening_checker/checks.py
index fa664e04861f31a4e655842d76bf71495cd9c6ae..0e2bb7443a426975bfea0a59eeb5a566e7446534 100644
(file)
--- a/
kernel_hardening_checker/checks.py
+++ b/
kernel_hardening_checker/checks.py
@@
-11,10
+11,11
@@
This module contains knowledge for checks.
# pylint: disable=missing-function-docstring,line-too-long,invalid-name
# pylint: disable=too-many-branches,too-many-statements,too-many-locals
# pylint: disable=missing-function-docstring,line-too-long,invalid-name
# pylint: disable=too-many-branches,too-many-statements,too-many-locals
-from .engine import KconfigCheck, CmdlineCheck, SysctlCheck, VersionCheck, OR, AND
+from .engine import StrOrNone, ChecklistObjType, KconfigCheck, CmdlineCheck, SysctlCheck, VersionCheck, OR, AND
+from typing import List
-def add_kconfig_checks(l
, arch)
:
+def add_kconfig_checks(l
: List[ChecklistObjType], arch: str) -> None
:
assert(arch), 'empty arch'
# Calling the KconfigCheck class constructor:
assert(arch), 'empty arch'
# Calling the KconfigCheck class constructor:
@@
-422,7
+423,7
@@
def add_kconfig_checks(l, arch):
l += [KconfigCheck('harden_userspace', 'a13xp0p0v', 'X86_USER_SHADOW_STACK', 'y')]
l += [KconfigCheck('harden_userspace', 'a13xp0p0v', 'X86_USER_SHADOW_STACK', 'y')]
-def add_cmdline_checks(l
, arch)
:
+def add_cmdline_checks(l
: List[ChecklistObjType], arch: str) -> None
:
assert(arch), 'empty arch'
# Calling the CmdlineCheck class constructor:
assert(arch), 'empty arch'
# Calling the CmdlineCheck class constructor:
@@
-630,7
+631,7
@@
no_kstrtobool_options = [
]
]
-def normalize_cmdline_options(option
, value)
:
+def normalize_cmdline_options(option
: str, value: str) -> str
:
# Don't normalize the cmdline option values if
# the Linux kernel doesn't use kstrtobool() for them
if option in no_kstrtobool_options:
# Don't normalize the cmdline option values if
# the Linux kernel doesn't use kstrtobool() for them
if option in no_kstrtobool_options:
@@
-657,7
+658,7
@@
def normalize_cmdline_options(option, value):
# kernel.warn_limit (think about a proper value)
# net.ipv4.tcp_syncookies=1 (?)
# kernel.warn_limit (think about a proper value)
# net.ipv4.tcp_syncookies=1 (?)
-def add_sysctl_checks(l
, _arch)
:
+def add_sysctl_checks(l
: List[ChecklistObjType], _arch: StrOrNone) -> None
:
# This function may be called with arch=None
# Calling the SysctlCheck class constructor:
# This function may be called with arch=None
# Calling the SysctlCheck class constructor: