X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=kconfig_hardened_check%2F__init__.py;h=eb256de8b2e95b47ede1045bbbab2535d7886f2b;hb=f9438fccaee4cf9f77ac4daaf4a0ddf7f996f108;hp=48f40196f082fedac3175318986fb6d866d209ce;hpb=4dcb0cdd1c84d90f268c9f970ff5b0093b12fcd8;p=kconfig-hardened-check.git

diff --git a/kconfig_hardened_check/__init__.py b/kconfig_hardened_check/__init__.py
index 48f4019..eb256de 100644
--- a/kconfig_hardened_check/__init__.py
+++ b/kconfig_hardened_check/__init__.py
@@ -312,6 +312,7 @@ def construct_checklist(l, arch):
                      VerCheck((5, 9))))] # HARDEN_EL2_VECTORS was included in RANDOMIZE_BASE in v5.9
         l += [OptCheck('self_protection', 'defconfig', 'RODATA_FULL_DEFAULT_ENABLED', 'y')]
         l += [OptCheck('self_protection', 'defconfig', 'ARM64_PTR_AUTH', 'y')]
+        l += [OptCheck('self_protection', 'defconfig', 'ARM64_BTI_KERNEL', 'y')]
     if arch in ('X86_64', 'ARM64'):
         l += [OptCheck('self_protection', 'defconfig', 'VMAP_STACK', 'y')]
     if arch in ('X86_64', 'ARM64', 'X86_32'):
@@ -395,6 +396,9 @@ def construct_checklist(l, arch):
                   iommu_support_is_set)]
 
     # 'self_protection', 'my'
+    l += [AND(OptCheck('self_protection', 'my', 'UBSAN_BOUNDS', 'y'),
+              OptCheck('self_protection', 'my', 'UBSAN_MISC', 'is not set'),
+              OptCheck('self_protection', 'my', 'UBSAN_TRAP', 'y'))]
     l += [OptCheck('self_protection', 'my', 'SLUB_DEBUG_ON', 'y')] # TODO: is it better to set that via kernel cmd?
     l += [OptCheck('self_protection', 'my', 'RESET_ATTACK_MITIGATION', 'y')] # needs userspace support (systemd)
     if arch == 'X86_64':