From 1f0950f261af9fff8378709c3e80c1904954573a Mon Sep 17 00:00:00 2001 From: Alexander Popov Date: Fri, 29 Nov 2019 00:07:48 +0300 Subject: [PATCH] X86_INTEL_UMIP is now X86_UMIP --- kconfig-hardened-check.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kconfig-hardened-check.py b/kconfig-hardened-check.py index 2dfa407..d7da0fd 100755 --- a/kconfig-hardened-check.py +++ b/kconfig-hardened-check.py @@ -191,7 +191,8 @@ def construct_checklist(checklist, arch): checklist.append(OptCheck('MICROCODE', 'y', 'defconfig', 'self_protection')) # is needed for mitigating CPU bugs checklist.append(OptCheck('RETPOLINE', 'y', 'defconfig', 'self_protection')) checklist.append(OptCheck('X86_SMAP', 'y', 'defconfig', 'self_protection')) - checklist.append(OptCheck('X86_INTEL_UMIP', 'y', 'defconfig', 'self_protection')) + checklist.append(OR(OptCheck('X86_UMIP', 'y', 'defconfig', 'self_protection'), \ + OptCheck('X86_INTEL_UMIP', 'y', 'defconfig', 'self_protection'))) iommu_support_is_set = OptCheck('IOMMU_SUPPORT', 'y', 'defconfig', 'self_protection') # is needed for mitigating DMA attacks checklist.append(iommu_support_is_set) checklist.append(AND(OptCheck('INTEL_IOMMU', 'y', 'defconfig', 'self_protection'), \ -- 2.31.1