diff options
| author | Sami Tolvanen <samitolvanen@google.com> | 2018-04-23 12:52:07 -0700 |
|---|---|---|
| committer | Alistair Delva <adelva@google.com> | 2019-11-26 13:27:48 -0800 |
| commit | e7b2999eae3fa970ddb8c43d8835430221ad7a7b (patch) | |
| tree | 8ae48b8adcbd8ee47ec40d81ed055768ca939e31 | |
| parent | 2e34bc14ef7996dd9f8adc9e49c83748054193b3 (diff) | |
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>
| -rw-r--r-- | arch/arm64/kvm/Makefile | 1 | ||||
| -rw-r--r-- | 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)) |