x86/cfi,bpf: Fix CFI vs eBPF
Status from this message: This series was applied to bpf/bpf-next.git (master)
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v3 Latest7 patches 1 replyApplied 7/7
- v22 patches 32 repliesSuperseded
- v12 patches 11 repliesSuperseded
Patches in v3 All 7 applied
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/7 | cfi: Flip headersarch/ arch/ arch/ +4 more | +14 | 0 replies | Applied |
| 2/7 | x86/cfi,bpf: Fix BPF JIT callarch/ arch/ arch/ +3 more | +269 | 0 replies | Applied |
| 3/7 | x86/cfi,bpf: Fix bpf_callback_t CFIarch/ arch/ arch/ | +30 | 0 replies | Applied |
| 4/7 | x86/cfi,bpf: Fix bpf_struct_ops CFIarch/ arch/ arch/ +4 more | +191 | 0 replies | Applied |
| 5/7 | cfi: Add CFI_NOSEAL()arch/ include/ | +9 | 0 replies | Applied |
| 6/7 | bpf: Fix dtor CFIkernel/ kernel/ net/ | +34 | 0 replies | Applied |
| 7/7 | x86/cfi,bpf: Fix bpf_exception_cb() signatureinclude/ kernel/ | +2 | 0 replies | Applied |
Reviews trailers per patch
1 of 7 patches has a Reviewed-by or Acked-by.
| Patch | Sami Tolvanen |
|---|---|
| 1/7 | R-b |
| 2/7 | |
| 3/7 | |
| 4/7 | |
| 5/7 | |
| 6/7 | |
| 7/7 |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
Cover letter [PATCH v3 0/7] x86/cfi,bpf: Fix CFI vs eBPF
Hi!
What started with the simple observation that bpf_dispatcher_*_func() was broken for calling CFI functions with a __nocfi calling context for FineIBT ended up with a complete BPF wide CFI fixup.
With these changes on the BPF selftest suite passes without crashing -- there's still a few failures, but Alexei has graciously offered to look into those.
(Alexei, I have presumed your SoB on the very last patch, please update as you see fit)
Changes since v2 are numerous but include:
- cfi_get_offset() -- as a means to communicate the offset (ast)
- 5 new patches fixing various BPF internals to be CFI clean
Note: it *might* be possible to merge the bpf_bpf_tcp_ca.c:unsupported_ops[] thing into the CFI stubs, as is get_info will have a NULL stub, unlike the others.
--- arch/riscv/include/asm/cfi.h | 3 +- arch/riscv/kernel/cfi.c | 2 +- arch/x86/include/asm/cfi.h | 126 +++++++++++++++++++++++++++++++++++++- arch/x86/kernel/alternative.c | 87 +++++++++++++++++++++++--- arch/x86/kernel/cfi.c | 4 +- arch/x86/net/bpf_jit_comp.c | 134 +++++++++++++++++++++++++++++++++++------ include/asm-generic/Kbuild | 1 + include/linux/bpf.h | 27 ++++++++- include/linux/cfi.h | 12 ++++ kernel/bpf/bpf_struct_ops.c | 16 ++--- kernel/bpf/core.c | 25 ++++++++ kernel/bpf/cpumask.c | 8 ++- kernel/bpf/helpers.c | 18 +++++- net/bpf/bpf_dummy_struct_ops.c | 31 +++++++++- net/bpf/test_run.c | 15 ++++- net/ipv4/bpf_tcp_ca.c | 69 +++++++++++++++++++++ 16 files changed, 528 insertions(+), 50 deletions(-)
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv