Show the option type in print_unknown_options()

[kconfig-hardened-check.git] / kernel_hardening_checker / __init__.py

diff --git a/kernel_hardening_checker/__init__.py b/kernel_hardening_checker/__init__.py
index 066b3977ffbc0b228bdcd528befa5bb629957693..212cf620dd78dd7722e17f2a0cc59f27d4f0cb8e 100644 (file)
--- a/kernel_hardening_checker/__init__.py
+++ b/kernel_hardening_checker/__init__.py
@@ -31,7 +31,7 @@ def _open(file: str, *args, **kwargs):
 
 def detect_arch(fname, archs):
     with _open(fname, 'rt', encoding='utf-8') as f:
-        arch_pattern = re.compile("CONFIG_[a-zA-Z0-9_]+=y$")
+        arch_pattern = re.compile(r"CONFIG_[a-zA-Z0-9_]+=y$")
         arch = None
         for line in f.readlines():
             if arch_pattern.match(line):
@@ -48,7 +48,7 @@ def detect_arch(fname, archs):
 
 def detect_kernel_version(fname):
     with _open(fname, 'rt', encoding='utf-8') as f:
-        ver_pattern = re.compile("^# Linux/.+ Kernel Configuration$|^Linux version .+")
+        ver_pattern = re.compile(r"^# Linux/.+ Kernel Configuration$|^Linux version .+")
         for line in f.readlines():
             if ver_pattern.match(line):
                 line = line.strip()
@@ -80,7 +80,7 @@ def detect_compiler(fname):
     sys.exit(f'[!] ERROR: invalid GCC_VERSION and CLANG_VERSION: {gcc_version} {clang_version}')
 
 
-def print_unknown_options(checklist, parsed_options):
+def print_unknown_options(checklist, parsed_options, opt_type):
     known_options = []
 
     for o1 in checklist:
@@ -100,7 +100,7 @@ def print_unknown_options(checklist, parsed_options):
 
     for option, value in parsed_options.items():
         if option not in known_options:
-            print(f'[?] No check for option {option} ({value})')
+            print(f'[?] No check for {opt_type} option {option} ({value})')
 
 
 def print_checklist(mode, checklist, with_results):
@@ -152,8 +152,8 @@ def print_checklist(mode, checklist, with_results):
 
 def parse_kconfig_file(mode, parsed_options, fname):
     with _open(fname, 'rt', encoding='utf-8') as f:
-        opt_is_on = re.compile("CONFIG_[a-zA-Z0-9_]+=.+$")
-        opt_is_off = re.compile("# CONFIG_[a-zA-Z0-9_]+ is not set$")
+        opt_is_on = re.compile(r"CONFIG_[a-zA-Z0-9_]+=.+$")
+        opt_is_off = re.compile(r"# CONFIG_[a-zA-Z0-9_]+ is not set$")
 
         for line in f.readlines():
             line = line.strip()
@@ -201,7 +201,7 @@ def parse_cmdline_file(mode, parsed_options, fname):
 
 def parse_sysctl_file(mode, parsed_options, fname):
     with open(fname, 'r', encoding='utf-8') as f:
-        sysctl_pattern = re.compile("[a-zA-Z0-9/\._-]+ =.*$")
+        sysctl_pattern = re.compile(r"[a-zA-Z0-9/\._-]+ =.*$")
         for line in f.readlines():
             line = line.strip()
             if not sysctl_pattern.match(line):
@@ -335,12 +335,11 @@ def main():
 
         if mode == 'verbose':
             # print the parsed options without the checks (for debugging)
-            all_parsed_options = parsed_kconfig_options # assignment does not copy
+            print_unknown_options(config_checklist, parsed_kconfig_options, 'kconfig')
             if args.cmdline:
-                all_parsed_options.update(parsed_cmdline_options)
+                print_unknown_options(config_checklist, parsed_cmdline_options, 'cmdline')
             if args.sysctl:
-                all_parsed_options.update(parsed_sysctl_options)
-            print_unknown_options(config_checklist, all_parsed_options)
+                print_unknown_options(config_checklist, parsed_sysctl_options, 'sysctl')
 
         # finally print the results
         print_checklist(mode, config_checklist, True)
@@ -371,7 +370,7 @@ def main():
 
         if mode == 'verbose':
             # print the parsed options without the checks (for debugging)
-            print_unknown_options(config_checklist, parsed_sysctl_options)
+            print_unknown_options(config_checklist, parsed_sysctl_options, 'sysctl')
 
         # finally print the results
         print_checklist(mode, config_checklist, True)