From: Alexander Popov <alex.popov@linux.com>
Date: Tue, 9 Nov 2021 18:29:10 +0000 (+0300)
Subject: Keep the old X86_PTDUMP check as a backup
X-Git-Tag: v0.5.17~38
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;ds=sidebyside;h=96770e5bca7df5bfcf09b8159149fafc659a87e4;p=kconfig-hardened-check.git

Keep the old X86_PTDUMP check as a backup
---

diff --git a/kconfig_hardened_check/__init__.py b/kconfig_hardened_check/__init__.py
index 18ba353..e1f9082 100644
--- a/kconfig_hardened_check/__init__.py
+++ b/kconfig_hardened_check/__init__.py
@@ -532,7 +532,8 @@ def construct_checklist(l, arch):
     l += [OptCheck('cut_attack_surface', 'grsecurity', 'KCOV', 'is not set')]
     l += [OptCheck('cut_attack_surface', 'grsecurity', 'PROVIDE_OHCI1394_DMA_INIT', 'is not set')]
     l += [OptCheck('cut_attack_surface', 'grsecurity', 'SUNRPC_DEBUG', 'is not set')]
-    l += [OptCheck('cut_attack_surface', 'grsecurity', 'PTDUMP_DEBUGFS', 'is not set')]
+    l += [AND(OptCheck('cut_attack_surface', 'grsecurity', 'PTDUMP_DEBUGFS', 'is not set'),
+              OptCheck('cut_attack_surface', 'grsecurity', 'X86_PTDUMP', 'is not set'))]
 
     # 'cut_attack_surface', 'maintainer'
     l += [OptCheck('cut_attack_surface', 'maintainer', 'DRM_LEGACY', 'is not set')] # recommended by Daniel Vetter in /issues/38