Skip to content

Fixes for dynptr

Kumar Kartikeya Dwivedi bpf 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest13 patches 40 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/13bpf: Refactor ARG_PTR_TO_DYNPTR checks into process_dynptr_funcinclude/linux/bpf_verifier.h kernel/bpf/btf.c kernel/bpf/verifier.c +2 more+69 -885 replies
2/13bpf: Rework process_dynptr_funcinclude/linux/bpf.h include/uapi/linux/bpf.h kernel/bpf/btf.c +5 more+185 -744 replies
3/13bpf: Rename confusingly named RET_PTR_TO_ALLOC_MEMinclude/linux/bpf.h kernel/bpf/verifier.c+4 -44 replies
4/13bpf: Rework check_func_arg_reg_offkernel/bpf/verifier.c tools/testing/selftests/bpf/verifier/ringbuf.c+44 -134 replies
5/13bpf: Fix state pruning for STACK_DYNPTR stack slotskernel/bpf/verifier.c+73 -03 replies
6/13bpf: Fix missing var_off check for ARG_PTR_TO_DYNPTRkernel/bpf/verifier.c tools/testing/selftests/bpf/prog_tests/dynptr.c tools/testing/selftests/bpf/prog_tests/kfunc_dynptr_param.c+67 -218 replies
7/13bpf: Fix partial dynptr stack slot reads/writeskernel/bpf/verifier.c+76 -07 replies
8/13bpf: Use memmove for bpf_dynptr_{read,write}kernel/bpf/helpers.c+2 -21 reply
9/13selftests/bpf: Add test for dynptr reinit in user_ringbuf callbacktools/testing/selftests/bpf/prog_tests/user_ringbuf.c tools/testing/selftests/bpf/progs/user_ringbuf_fail.c+37 -01 reply
10/13selftests/bpf: Add dynptr pruning teststools/testing/selftests/bpf/verifier/dynptr.c+90 -00 replies
11/13selftests/bpf: Add dynptr var_off teststools/testing/selftests/bpf/verifier/dynptr.c+36 -20 replies
12/13selftests/bpf: Add dynptr partial slot overwrite teststools/testing/selftests/bpf/verifier/dynptr.c+58 -00 replies
13/13selftests/bpf: Add dynptr helper teststools/testing/selftests/bpf/prog_tests/dynptr.c tools/testing/selftests/bpf/progs/dynptr_fail.c tools/testing/selftests/bpf/progs/dynptr_success.c+58 -00 replies

Reviews trailers per patch

3 of 13 patches have a Reviewed-by or Acked-by.

PatchDavid VernetJoanne Koong
1/13A-b
2/13
3/13
4/13
5/13
6/13
7/13
8/13A-b
9/13A-b
10/13
11/13
12/13
13/13

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [PATCH bpf-next v1 00/13] Fixes for dynptr

This set fixes multiple issues in the dynptr code discovered during code review.

- Missing dynptr stack slot liveness propagation
- Missing checks for PTR_TO_STACK variable offset
- Incomplete destruction of dynptr stack slots on writes
- Modification of dynptr struct through callback argument with reg->type == PTR_TO_DYNPTR

These can be abused to perform arbitrary kernel memory reads/writes by replacing dynptr contents.

The first three cases are now unreachable from unprivileged BPF since the commit 8addbfc7b308 ("bpf: Gate dynptr API behind CAP_BPF") which has been applied to released stable kernels v6.0.1 and v5.19.15.

The changes are fairly intrusive and non-trivial, in-depth review is warranted, as they rework the code before making the fixes to it, but for the better (IMO).

Please see the individual commit logs for the details.

Kumar Kartikeya Dwivedi (13):
bpf: Refactor ARG_PTR_TO_DYNPTR checks into process_dynptr_func
bpf: Rework process_dynptr_func
bpf: Rename confusingly named RET_PTR_TO_ALLOC_MEM
bpf: Rework check_func_arg_reg_off
bpf: Fix state pruning for STACK_DYNPTR stack slots
bpf: Fix missing var_off check for ARG_PTR_TO_DYNPTR
bpf: Fix partial dynptr stack slot reads/writes
bpf: Use memmove for bpf_dynptr_{read,write} selftests/bpf: Add test for dynptr reinit in user_ringbuf callback selftests/bpf: Add dynptr pruning tests
selftests/bpf: Add dynptr var_off tests
selftests/bpf: Add dynptr partial slot overwrite tests selftests/bpf: Add dynptr helper tests

 include/linux/bpf.h                           |  10 +-
 include/linux/bpf_verifier.h                  |   8 +-
 include/uapi/linux/bpf.h                      |   8 +-
 kernel/bpf/btf.c                              |  22 +-
 kernel/bpf/helpers.c                          |  22 +-
 kernel/bpf/verifier.c                         | 574 ++++++++++++++----
 scripts/bpf_doc.py                            |   1 +
 tools/include/uapi/linux/bpf.h                |   8 +-
 .../testing/selftests/bpf/prog_tests/dynptr.c |   9 +-
 .../bpf/prog_tests/kfunc_dynptr_param.c       |   5 +-
 .../selftests/bpf/prog_tests/user_ringbuf.c   |  12 +-
 .../testing/selftests/bpf/progs/dynptr_fail.c |  35 ++
 .../selftests/bpf/progs/dynptr_success.c      |  20 +
 .../bpf/progs/test_kfunc_dynptr_param.c       |  12 -
 .../selftests/bpf/progs/user_ringbuf_fail.c   |  35 ++
 tools/testing/selftests/bpf/verifier/dynptr.c | 182 ++++++
 .../testing/selftests/bpf/verifier/ringbuf.c  |   2 +-
 17 files changed, 780 insertions(+), 185 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/verifier/dynptr.c
Signature · 1 line
2.38.0