Revert "ANDROID: add support for Clang's Control Flow Integrity (CFI)"

This reverts commit fa91466f31 as CFI is
being removed from the tree to come back later as a "clean" set of
patches.

Bug: 145210207
Cc: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I37cca753c39eef4c6fcef20e38d4f01fe78b4dee
This commit is contained in:
Greg Kroah-Hartman
2020-07-17 15:07:23 +02:00
parent 84c5fb5174
commit bd98af7d21
12 changed files with 6 additions and 441 deletions

View File

@@ -1,44 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0 */
/*
* Clang Control Flow Integrity (CFI) support.
*
* Copyright (C) 2019 Google LLC
*/
#ifndef _LINUX_CFI_H
#define _LINUX_CFI_H
#include <linux/stringify.h>
#ifdef CONFIG_CFI_CLANG
#ifdef CONFIG_MODULES
typedef void (*cfi_check_fn)(uint64_t id, void *ptr, void *diag);
/* Compiler-generated function in each module, and the kernel */
#define CFI_CHECK_FN __cfi_check
#define CFI_CHECK_FN_NAME __stringify(CFI_CHECK_FN)
extern void CFI_CHECK_FN(uint64_t id, void *ptr, void *diag);
#ifdef CONFIG_CFI_CLANG_SHADOW
extern void cfi_module_add(struct module *mod, unsigned long min_addr,
unsigned long max_addr);
extern void cfi_module_remove(struct module *mod, unsigned long min_addr,
unsigned long max_addr);
#else
static inline void cfi_module_add(struct module *mod, unsigned long min_addr,
unsigned long max_addr)
{
}
static inline void cfi_module_remove(struct module *mod, unsigned long min_addr,
unsigned long max_addr)
{
}
#endif /* CONFIG_CFI_CLANG_SHADOW */
#endif /* CONFIG_MODULES */
#endif /* CONFIG_CFI_CLANG */
#endif /* _LINUX_CFI_H */