| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| From: Sami Tolvanen <samitolvanen@google.com> |
| Date: Mon, 23 Apr 2018 12:52:07 -0700 |
| Subject: ANDROID: arm64: kvm: disable CFI |
| |
| Disable CFI for code that runs at EL2 because __cfi_check only |
| understands EL1 addresses. |
| |
| Bug: 145210207 |
| Change-Id: I0053c4e42a0f40423ac94ab73077034e97e0ff31 |
| Signed-off-by: Sami Tolvanen <samitolvanen@google.com> |
| --- |
| arch/arm64/kvm/Makefile | 1 + |
| arch/arm64/kvm/hyp/Makefile | 4 ++-- |
| 2 files changed, 3 insertions(+), 2 deletions(-) |
| |
| diff --git a/arch/arm64/kvm/Makefile b/arch/arm64/kvm/Makefile |
| index 3ac1a64d2fb9..89f8c4558f15 100644 |
| --- a/arch/arm64/kvm/Makefile |
| +++ b/arch/arm64/kvm/Makefile |
| @@ -4,6 +4,7 @@ |
| # |
| |
| ccflags-y += -I $(srctree)/$(src) -I $(srctree)/virt/kvm/arm/vgic |
| +CFLAGS_REMOVE_debug.o += $(CC_FLAGS_CFI) |
| |
| KVM=../../../virt/kvm |
| |
| diff --git a/arch/arm64/kvm/hyp/Makefile b/arch/arm64/kvm/hyp/Makefile |
| index 17ea3da325e9..67aa18a539ea 100644 |
| --- a/arch/arm64/kvm/hyp/Makefile |
| +++ b/arch/arm64/kvm/hyp/Makefile |
| @@ -29,5 +29,5 @@ KASAN_SANITIZE := n |
| UBSAN_SANITIZE := n |
| KCOV_INSTRUMENT := n |
| |
| -# remove the SCS flags from all objects in this directory |
| -KBUILD_CFLAGS := $(filter-out $(CC_FLAGS_SCS), $(KBUILD_CFLAGS)) |
| +# remove SCS and CFI flags from all objects in this directory |
| +KBUILD_CFLAGS := $(filter-out $(CC_FLAGS_SCS) $(CC_FLAGS_CFI), $(KBUILD_CFLAGS)) |
