X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=kconfig_hardened_check%2F__init__.py;h=218e8fd7d8504ca08aa664edf8994a1e4a05e7e3;hb=da3daebde9537381f2acc49b5d959fdd7312cde5;hp=a7beeb707c8944b6dbb57f2a01ef88c52f47148b;hpb=f58107666fc73a49e965aa7111e899e539d1c4b7;p=kconfig-hardened-check.git

diff --git a/kconfig_hardened_check/__init__.py b/kconfig_hardened_check/__init__.py
index a7beeb7..218e8fd 100644
--- a/kconfig_hardened_check/__init__.py
+++ b/kconfig_hardened_check/__init__.py
@@ -288,7 +288,7 @@ def detect_arch(fname, archs):
         return arch, 'OK'
 
 
-def detect_version(fname):
+def detect_kernel_version(fname):
     with open(fname, 'r') as f:
         ver_pattern = re.compile("# Linux/.* Kernel Configuration")
         for line in f.readlines():
@@ -304,6 +304,26 @@ def detect_version(fname):
         return None, 'no kernel version detected'
 
 
+def detect_compiler(fname):
+    gcc_version = None
+    clang_version = None
+    with open(fname, 'r') as f:
+        gcc_version_pattern = re.compile("CONFIG_GCC_VERSION=[0-9]*")
+        clang_version_pattern = re.compile("CONFIG_CLANG_VERSION=[0-9]*")
+        for line in f.readlines():
+            if gcc_version_pattern.match(line):
+                gcc_version = line[19:-1]
+            if clang_version_pattern.match(line):
+                clang_version = line[21:-1]
+    if not gcc_version or not clang_version:
+        return None, 'no CONFIG_GCC_VERSION or CONFIG_CLANG_VERSION'
+    if gcc_version == '0' and clang_version != '0':
+        return 'CLANG ' + clang_version, 'OK'
+    if gcc_version != '0' and clang_version == '0':
+        return 'GCC ' + gcc_version, 'OK'
+    sys.exit('[!] ERROR: invalid GCC_VERSION and CLANG_VERSION: {} {}'.format(gcc_version, clang_version))
+
+
 def add_kconfig_checks(l, arch):
     # Calling the KconfigCheck class constructor:
     #     KconfigCheck(reason, decision, name, expected)
@@ -312,8 +332,8 @@ def add_kconfig_checks(l, arch):
     #     when the tool doesn't check the cmdline.
 
     efi_not_set = KconfigCheck('-', '-', 'EFI', 'is not set')
-    cc_is_gcc = KconfigCheck('-', '-', 'CC_IS_GCC', 'y')
-    cc_is_clang = KconfigCheck('-', '-', 'CC_IS_CLANG', 'y')
+    cc_is_gcc = KconfigCheck('-', '-', 'CC_IS_GCC', 'y') # exists since v4.18
+    cc_is_clang = KconfigCheck('-', '-', 'CC_IS_CLANG', 'y') # exists since v4.18
 
     modules_not_set = KconfigCheck('cut_attack_surface', 'kspp', 'MODULES', 'is not set')
     devmem_not_set = KconfigCheck('cut_attack_surface', 'kspp', 'DEVMEM', 'is not set') # refers to LOCKDOWN
@@ -485,6 +505,9 @@ def add_kconfig_checks(l, arch):
     # 'self_protection', 'my'
     l += [OR(KconfigCheck('self_protection', 'my', 'RESET_ATTACK_MITIGATION', 'y'),
              efi_not_set)] # needs userspace support (systemd)
+    l += [OR(KconfigCheck('self_protection', 'my', 'UBSAN_LOCAL_BOUNDS', 'y'),
+             AND(ubsan_bounds_is_set,
+                 cc_is_gcc))]
     if arch == 'X86_64':
         l += [KconfigCheck('self_protection', 'my', 'SLS', 'y')] # vs CVE-2021-26341 in Straight-Line-Speculation
         l += [AND(KconfigCheck('self_protection', 'my', 'AMD_IOMMU_V2', 'y'),
@@ -959,12 +982,19 @@ def main():
         if mode != 'json':
             print('[+] Detected architecture: {}'.format(arch))
 
-        kernel_version, msg = detect_version(args.config)
+        kernel_version, msg = detect_kernel_version(args.config)
         if not kernel_version:
             sys.exit('[!] ERROR: {}'.format(msg))
         if mode != 'json':
             print('[+] Detected kernel version: {}.{}'.format(kernel_version[0], kernel_version[1]))
 
+        compiler, msg = detect_compiler(args.config)
+        if mode != 'json':
+            if compiler:
+                print('[+] Detected compiler: {}'.format(compiler))
+            else:
+                print('[-] Can\'t detect the compiler: {}'.format(msg))
+
         # add relevant kconfig checks to the checklist
         add_kconfig_checks(config_checklist, arch)