From: Marc Zyngier <marc.zyngier@arm.com>
Date: Tue, 2 May 2017 13:30:37 +0000 (+0100)
Subject: arm64: KVM: Do not use stack-protector to compile EL2 code
X-Git-Tag: Ubuntu-4.10.0-33.37~36
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=91fe9cc6928106bd62aed6223d6e2dc6cb7eea08;p=mirror_ubuntu-zesty-kernel.git

arm64: KVM: Do not use stack-protector to compile EL2 code

BugLink: https://bugs.launchpad.net/bugs/1673564

We like living dangerously. Nothing explicitely forbids stack-protector
to be used in the EL2 code, while distributions routinely compile their
kernel with it. We're just lucky that no code actually triggers the
instrumentation.

Let's not try our luck for much longer, and disable stack-protector
for code living at EL2.

Cc: stable@vger.kernel.org
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Acked-by: Christoffer Dall <cdall@linaro.org>
Signed-off-by: Christoffer Dall <cdall@linaro.org>
(cherry picked from commit cde13b5dad60471886a3bccb4f4134c647c4a9dc)
[ dannf: This fixes a KVM panic() exposed by the remainder of the series ]
Signed-off-by: dann frazier <dann.frazier@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
---

diff --git a/arch/arm64/kvm/hyp/Makefile b/arch/arm64/kvm/hyp/Makefile
index aaf42ae8d8c3..14c4e3b14bcb 100644
--- a/arch/arm64/kvm/hyp/Makefile
+++ b/arch/arm64/kvm/hyp/Makefile
@@ -2,6 +2,8 @@
 # Makefile for Kernel-based Virtual Machine module, HYP part
 #
 
+ccflags-y += -fno-stack-protector
+
 KVM=../../../../virt/kvm
 
 obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/vgic-v2-sr.o