From: Pelle van Gils <pelle@vangils.xyz>
Date: Mon, 19 Oct 2020 13:07:53 +0000 (+0200)
Subject: Do not check CONFIG_HARDEN_EL2_VECTORS for v5.9+
X-Git-Tag: v0.5.9~11^2
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=refs%2Fpull%2F48%2Fhead;p=kconfig-hardened-check.git

Do not check CONFIG_HARDEN_EL2_VECTORS for v5.9+
---

diff --git a/kconfig_hardened_check/__init__.py b/kconfig_hardened_check/__init__.py
index aa08c12..0d1e10c 100644
--- a/kconfig_hardened_check/__init__.py
+++ b/kconfig_hardened_check/__init__.py
@@ -293,7 +293,8 @@ def construct_checklist(l, arch):
     if arch == 'ARM64':
         l += [OptCheck('self_protection', 'defconfig', 'ARM64_PAN', 'y')]
         l += [OptCheck('self_protection', 'defconfig', 'UNMAP_KERNEL_AT_EL0', 'y')]
-        l += [OptCheck('self_protection', 'defconfig', 'HARDEN_EL2_VECTORS', 'y')]
+        l += [OR(OptCheck('self_protection', 'defconfig', 'HARDEN_EL2_VECTORS', 'y'),
+                 VerCheck((5,9)))] # HARDEN_EL2_VECTORS was removed in v5.9
         l += [OptCheck('self_protection', 'defconfig', 'RODATA_FULL_DEFAULT_ENABLED', 'y')]
         l += [OptCheck('self_protection', 'defconfig', 'ARM64_PTR_AUTH', 'y')]
     if arch in ('X86_64', 'ARM64'):