X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=kconfig-hardened-check.py;h=ca820687f40ab93789300bbac197b6b2a97d0156;hb=1a60bb967430bf0b5a03d11a3be354c654e50698;hp=0b32dfbcd6b8d4ec130c6745ef6ad0ba73c57070;hpb=660a4a5c0e16a279026197e6806a5dd044a44289;p=kconfig-hardened-check.git

diff --git a/kconfig-hardened-check.py b/kconfig-hardened-check.py
index 0b32dfb..ca82068 100755
--- a/kconfig-hardened-check.py
+++ b/kconfig-hardened-check.py
@@ -83,16 +83,20 @@ class OR:
         return self.opts[0].reason
 
     def check(self):
-        for opt in self.opts:
+        for i, opt in enumerate(self.opts):
             result, msg = opt.check()
             if result:
-                self.result = 'OK (CONFIG_{} {})'.format(opt.name, opt.state)
-                return result, self.result
-        self.result = 'FAIL: "{}"'.format(self.opts[0].state)
+                if i == 0:
+                    self.result = opt.result
+                else:
+                    self.result = 'CONFIG_{}: {} ("{}")'.format(opt.name, opt.result, opt.expected)
+                return True, self.result
+        self.result = self.opts[0].result
         return False, self.result
 
 
 def construct_opt_checks():
+    modules_not_set = OptCheck('MODULES',                'is not set', 'kspp', 'cut_attack_surface')
     devmem_not_set = OptCheck('DEVMEM',                  'is not set', 'kspp', 'cut_attack_surface')
 
     checklist.append(OptCheck('BUG',                     'y', 'ubuntu18', 'self_protection'))
@@ -104,8 +108,8 @@ def construct_opt_checks():
     checklist.append(OptCheck('DEBUG_WX',                'y', 'ubuntu18', 'self_protection'))
     checklist.append(OptCheck('RANDOMIZE_BASE',          'y', 'ubuntu18', 'self_protection'))
     checklist.append(OptCheck('RANDOMIZE_MEMORY',        'y', 'ubuntu18', 'self_protection'))
-    checklist.append(OptCheck('CC_STACKPROTECTOR',       'y', 'ubuntu18', 'self_protection'))
-    checklist.append(OptCheck('CC_STACKPROTECTOR_STRONG','y', 'ubuntu18', 'self_protection'))
+    checklist.append(OR(OptCheck('STACKPROTECTOR_STRONG','y', 'ubuntu18', 'self_protection'), \
+                     OptCheck('CC_STACKPROTECTOR_STRONG','y', 'ubuntu18', 'self_protection')))
     checklist.append(OptCheck('VMAP_STACK',              'y', 'ubuntu18', 'self_protection'))
     checklist.append(OptCheck('THREAD_INFO_IN_TASK',     'y', 'ubuntu18', 'self_protection'))
     checklist.append(OptCheck('SCHED_STACK_END_CHECK',   'y', 'ubuntu18', 'self_protection'))
@@ -114,9 +118,9 @@ def construct_opt_checks():
     checklist.append(OptCheck('SLAB_FREELIST_RANDOM',    'y', 'ubuntu18', 'self_protection'))
     checklist.append(OptCheck('HARDENED_USERCOPY',       'y', 'ubuntu18', 'self_protection'))
     checklist.append(OptCheck('FORTIFY_SOURCE',          'y', 'ubuntu18', 'self_protection'))
-    checklist.append(OptCheck('MODULE_SIG',              'y', 'ubuntu18', 'self_protection'))
-    checklist.append(OptCheck('MODULE_SIG_ALL',          'y', 'ubuntu18', 'self_protection'))
-    checklist.append(OptCheck('MODULE_SIG_SHA512',       'y', 'ubuntu18', 'self_protection'))
+    checklist.append(OR(OptCheck('MODULE_SIG',           'y', 'ubuntu18', 'self_protection'), modules_not_set))
+    checklist.append(OR(OptCheck('MODULE_SIG_ALL',       'y', 'ubuntu18', 'self_protection'), modules_not_set))
+    checklist.append(OR(OptCheck('MODULE_SIG_SHA512',    'y', 'ubuntu18', 'self_protection'), modules_not_set))
     checklist.append(OptCheck('SYN_COOKIES',             'y', 'ubuntu18', 'self_protection')) # another reason?
     checklist.append(OptCheck('DEFAULT_MMAP_MIN_ADDR',   '65536', 'ubuntu18', 'self_protection'))
 
@@ -197,7 +201,7 @@ def construct_opt_checks():
 
     checklist.append(OptCheck('ARCH_MMAP_RND_BITS',   '32', 'my', 'userspace_protection'))
 
-    checklist.append(OptCheck('LKDTM',    'm', 'my', 'feature_test'))
+#   checklist.append(OptCheck('LKDTM',    'm', 'my', 'feature_test'))
 
 
 def print_opt_checks():
@@ -210,10 +214,10 @@ def print_opt_checks():
 
 
 def print_check_results():
-    print('  {:<39}|{:^13}|{:^10}|{:^20}||{:^20}'.format('option name', 'desired val', 'decision', 'reason', 'check result'))
-    print('  ===========================================================================================================')
+    print('  {:<39}|{:^13}|{:^10}|{:^20}||{:^28}'.format('option name', 'desired val', 'decision', 'reason', 'check result'))
+    print('  ===================================================================================================================')
     for opt in checklist:
-        print('  CONFIG_{:<32}|{:^13}|{:^10}|{:^20}||{:^20}'.format(opt.name, opt.expected, opt.decision, opt.reason, opt.result))
+        print('  CONFIG_{:<32}|{:^13}|{:^10}|{:^20}||{:^28}'.format(opt.name, opt.expected, opt.decision, opt.reason, opt.result))
     print()