tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "ANDROID: bpf: disable CFI for dispatcher functions"

Browse Source 
This reverts commit cedd91c6f4.

It conflicts with the BPF merge and will have to be added back later "by
hand".

Cc: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I9b070d804c16b12a416ddc630c4440ea85f5531b
This commit is contained in:
Greg Kroah-Hartman
2020-01-31 08:14:13 +01:00
parent 13e3108408
commit 24e0e1f009
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/linux/bpf.h
+2 -2
View File
@@ -489,7 +489,7 @@ struct bpf_dispatcher {
u32 image_off;
};
static __always_inline __nocfi unsigned int bpf_dispatcher_nopfunc(
static __always_inline unsigned int bpf_dispatcher_nopfunc(
const void *ctx,
const struct bpf_insn *insnsi,
unsigned int (*bpf_func)(const void *,
@@ -513,7 +513,7 @@ void *bpf_jit_alloc_exec_page(void);
}
#define DEFINE_BPF_DISPATCHER(name) \
noinline __nocfi unsigned int name##func( \
noinline unsigned int name##func( \
const void *ctx, \
const struct bpf_insn *insnsi, \
unsigned int (*bpf_func)(const void *, \