X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=kconfig_hardened_check%2F__init__.py;h=37bc1fb52a26b3ecea69a38d659de42e9e0635fa;hb=271e6bf01d9f854a696bb0b547194d90690c35d5;hp=548774526fc88ff78ccb19f8b89037a6f3684cce;hpb=eeb0b9ee58eec087b0bd7b5b3428b4c9d1078c4a;p=kconfig-hardened-check.git

diff --git a/kconfig_hardened_check/__init__.py b/kconfig_hardened_check/__init__.py
index 5487745..37bc1fb 100644
--- a/kconfig_hardened_check/__init__.py
+++ b/kconfig_hardened_check/__init__.py
@@ -73,8 +73,6 @@ report_modes = ['verbose', 'json']
 
 supported_archs = ['X86_64', 'X86_32', 'ARM64', 'ARM']
 
-kernel_version = None
-
 
 class OptCheck:
     def __init__(self, reason, decision, name, expected):
@@ -109,16 +107,17 @@ class OptCheck:
 class VerCheck:
     def __init__(self, ver_expected):
         self.ver_expected = ver_expected
+        self.ver = None
         self.result = None
 
     def check(self):
-        if kernel_version[0] > self.ver_expected[0]:
+        if self.ver[0] > self.ver_expected[0]:
             self.result = 'OK: version >= ' + str(self.ver_expected[0]) + '.' + str(self.ver_expected[1])
             return True
-        if kernel_version[0] < self.ver_expected[0]:
+        if self.ver[0] < self.ver_expected[0]:
             self.result = 'FAIL: version < ' + str(self.ver_expected[0]) + '.' + str(self.ver_expected[1])
             return False
-        if kernel_version[1] >= self.ver_expected[1]:
+        if self.ver[1] >= self.ver_expected[1]:
             self.result = 'OK: version >= ' + str(self.ver_expected[0]) + '.' + str(self.ver_expected[1])
             return True
         self.result = 'FAIL: version < ' + str(self.ver_expected[0]) + '.' + str(self.ver_expected[1])
@@ -563,13 +562,15 @@ def print_checklist(mode, checklist, with_results):
             print('[+] Config check is finished: \'OK\' - {} / \'FAIL\' - {}'.format(ok_count, error_count))
 
 
-def perform_checks(checklist, parsed_options):
+def perform_checks(checklist, parsed_options, kernel_version):
     for opt in checklist:
         if hasattr(opt, 'opts'):
             # prepare ComplexOptCheck
             for o in opt.opts:
                 if hasattr(o, 'state'):
                     o.state = parsed_options.get(o.name, None)
+                if hasattr(o, 'ver'):
+                    o.ver = kernel_version
         else:
             # prepare simple check
             if not hasattr(opt, 'state'):
@@ -605,9 +606,9 @@ def parse_config_file(parsed_options, fname):
 
 
 def main():
-    global kernel_version
-
     mode = None
+    arch = None
+    kernel_version = None
     config_checklist = []
     parsed_options = OrderedDict()
 
@@ -645,7 +646,7 @@ def main():
 
         construct_checklist(config_checklist, arch)
         parse_config_file(parsed_options, args.config)
-        perform_checks(config_checklist, parsed_options)
+        perform_checks(config_checklist, parsed_options, kernel_version)
 
         if mode == 'verbose':
             print_unknown_options(config_checklist, parsed_options)