From: Borislav Petkov <bp@suse.de>
Date: Tue, 2 Jan 2018 13:19:49 +0000 (+0100)
Subject: x86/kaiser: Reenable PARAVIRT
X-Git-Tag: v4.1.12-124.31.3~1314
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0fa48c3c41ac9864ecae6209aea66505989476d3;p=users%2Fjedix%2Flinux-maple.git

x86/kaiser: Reenable PARAVIRT

Now that the required bits have been addressed, reenable
PARAVIRT.

Signed-off-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 750fb627d764eb66430c36961b94ab0002694c02)
Orabug: 27333760
CVE: CVE-2017-5754
Signed-off-by: Pavel Tatashin <pasha.tatashin@oracle.com>
Signed-off-by: Kirtikar Kashyap <kirtikar.kashyap@oracle.com>
---

diff --git a/security/Kconfig b/security/Kconfig
index 3d36fd094439..10711540b822 100644
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -34,7 +34,7 @@ config SECURITY
 config KAISER
 	bool "Remove the kernel mapping in user mode"
 	default y
-	depends on X86_64 && SMP && !PARAVIRT
+	depends on X86_64 && SMP
 	help
 	  This enforces a strict kernel and user space isolation, in order
 	  to close hardware side channels on kernel address information.