Commit 141c2482 authored Jan 29, 2020 by Maciej Żenczykowski Committed by Alistair Delva Jan 29, 2020

ANDROID: fix bpf jit + cfi interactions

change from:
  https://android-review.googlesource.com/c/kernel/common/+/1126406
  ANDROID: bpf: validate bpf_func when BPF_JIT is enabled with CFI

was incorrectly reverted in:
  https://android-review.googlesource.com/c/kernel/common/+/1184358


  UPSTREAM: bpf: multi program support for cgroup+bpf

Test: builds
Bug: 121213201
Bug: 138317270
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I2b238de61340e58eb71aaa6cf6b59945a8740a08

parent 84974110

include/linux/filter.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -536,7 +536,7 @@ static inline void bpf_jit_set_header_magic(struct bpf_binary_header *hdr)
		}
		#endif

		#define BPF_PROG_RUN(filter, ctx) (*(filter)->bpf_func)(ctx, (filter)->insnsi)
		#define BPF_PROG_RUN(filter, ctx) bpf_call_func(filter, ctx)

		#define BPF_SKB_CB_LEN QDISC_CB_PRIV_LEN