Skip to content

Fix 32-bit arch and compat support for the kprobe_multi attach type

Eugene Syromiatnikov bpf linux-kselftest lkml netdev 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest4 patches 19 repliesIn review
  2. v24 patches 2 repliesSuperseded
  3. v14 patches 3 repliesSuperseded

Changes in v3 from the cover letter

- Rebased on top of bpf-next
- Removed unnecessary size/cookies_size assignments as suggested by Yonghong Sond

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/4bpf_trace: check size for overflow in bpf_kprobe_multi_link_attachkernel/trace/bpf_trace.c+4 -34 replies
2/4bpf_trace: support 32-bit kernels in bpf_kprobe_multi_link_attachkernel/trace/bpf_trace.c+8 -92 replies
3/4bpf_trace: handle compat in copy_user_symskernel/trace/bpf_trace.c+19 -11 reply
4/4bpf_trace: pass array of u64 values in kprobe_multi.addrskernel/trace/bpf_trace.c tools/lib/bpf/bpf.h tools/lib/bpf/libbpf.c +3 more+32 -1512 replies

Reviews trailers per patch

1 of 4 patches has a Reviewed-by or Acked-by.

PatchJiri Olsa
1/4A-b
2/4
3/4
4/4

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

Read the v3 thread

Cover letter [PATCH bpf-next v3 0/4] Fix 32-bit arch and compat support for the kprobe_multi attach type

As suggested in [1], the kprobe_multi interface is to be fixed for 32-bit architectures and compat, rather then disabled. As it turned out, there are a couple of additional problems that are to be addressed:
- the absence of size overflow checks, leading to possible out-of-bounds writes (addressed by the first patch; this one likely has to be fixed in 5.18, where the version of the patch from [3] may be preferrable, along with [4] to avoid applying the rest of the series);
- the assumption that long has the same size as u64, which would make cookies arrays size calculation incorrect on 32-bit architectures (addressed by the second patch);
- the addrs array passing API, that is incompatible with compat and has to be changed (addressed in the fourth patch): those are kernel addresses and not user ones (as was incorrectly stated in [2]); this change is only semantical for 64-bit user/kernelspace, so it shouldn't impact ABI there, at least.

[1] https://lore.kernel.org/lkml/CAADnVQ+2gwhcMht4PuDnDOFKY68Wsq8QFz4Y69NBX_TLaSexQQ@mail.gmail.com/
[2] https://lore.kernel.org/lkml/[email protected]/
[3] https://lore.kernel.org/lkml/[email protected]/
[4] https://lore.kernel.org/lkml/[email protected]/

v3:
- Rebased on top of bpf-next
- Removed unnecessary size/cookies_size assignments as suggested by Yonghong Sond

v2: https://lore.kernel.org/lkml/[email protected]/
- Fixed the isses reported by CI

v1: https://lore.kernel.org/lkml/[email protected]/

Eugene Syromiatnikov (4):
bpf_trace: check size for overflow in bpf_kprobe_multi_link_attach
bpf_trace: support 32-bit kernels in bpf_kprobe_multi_link_attach
bpf_trace: handle compat in copy_user_syms
bpf_trace: pass array of u64 values in kprobe_multi.addrs

 kernel/trace/bpf_trace.c                           | 67 ++++++++++++++++------
 tools/lib/bpf/bpf.h                                |  2 +-
 tools/lib/bpf/libbpf.c                             |  8 +--
 tools/lib/bpf/libbpf.h                             |  2 +-
 .../testing/selftests/bpf/prog_tests/bpf_cookie.c  |  2 +-
 .../selftests/bpf/prog_tests/kprobe_multi_test.c   |  8 +--
 6 files changed, 62 insertions(+), 27 deletions(-)
Signature · 1 line
2.1.4