selftests/bpf: Fixes for userspace ASAN
Status from this message: This series was applied to bpf/bpf.git (master)
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v4 Latest20 patches 4 repliesApplied 20/20
- v315 patches 7 repliesSuperseded
- v215 patches 12 repliesSuperseded
Earlier versions · 1
| Version | Posted | Patches | Replies | Status |
|---|---|---|---|---|
| v1 | 14 patches | 32 replies | Superseded |
Changes in v4 from the cover letter
- combine strscpy and ASAN series into one (Alexei)
- make the count arg of strscpy() optional via macro and fixup relevant call sites (Alexei)
- remove strscpy_cat() from this series (Alexei)
Patches in v4 All 20 applied
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/20 | selftests/bpf: Add simple strscpy() implementationtools/ tools/ tools/ | +37 | 0 replies | Applied |
| 2/20 | selftests/bpf: Replace strcpy() calls with strscpy()tools/ tools/ tools/ +3 more | +8 | 0 replies | Applied |
| 3/20 | selftests/bpf: Replace strncpy() with strscpy()tools/ tools/ tools/ +7 more | +13 | 3 replies | Applied |
| 4/20 | selftests/bpf: Use strscpy in bpftool_helpers.ctools/ | +7 | 0 replies | Applied |
| 5/20 | selftests/bpf: Use memcpy() for bounded non-NULL-terminated copiestools/ tools/ | +5 | 0 replies | Applied |
| 6/20 | selftests/bpf: Pass through build flags to bpftool and resolve_btfidstools/ tools/ | +14 | 0 replies | Applied |
| 7/20 | resolve_btfids: Fix memory leaks reported by ASANtools/ | +54 | 0 replies | Applied |
| 8/20 | selftests/bpf: Add DENYLIST.asantools/ | +3 | 0 replies | Applied |
| 9/20 | selftests/bpf: Refactor bpf_get_ksyms() trace helpertools/ tools/ tools/ +1 more | +34 | 1 reply | Applied |
| 10/20 | selftests/bpf: Fix memory leaks in teststools/ tools/ tools/ | +22 | 0 replies | Applied |
| 11/20 | selftests/bpf: Fix cleanup in check_fd_array_cnt__fd_array_too_big()tools/ | +2 | 0 replies | Applied |
| 12/20 | veristat: Fix a memory leak for preset ENUMERATORtools/ | +2 | 0 replies | Applied |
| 13/20 | selftests/bpf: Fix use-after-free in xdp_metadata testtools/ | +2 | 0 replies | Applied |
| 14/20 | selftests/bpf: Fix double thread join in uprobe_multi_testtools/ | +5 | 0 replies | Applied |
| 15/20 | selftests/bpf: Fix resource leaks caused by missing cleanupstools/ tools/ tools/ +4 more | +29 | 0 replies | Applied |
| 16/20 | selftests/bpf: Free bpf_object in test_sysctltools/ | +3 | 0 replies | Applied |
| 17/20 | selftests/bpf: Fix array bounds warning in jit_disasm_helperstools/ | +9 | 0 replies | Applied |
| 18/20 | selftests/bpf: Fix out-of-bounds array access bugs reported by ASANtools/ tools/ tools/ | +4 | 0 replies | Applied |
| 19/20 | selftests/bpf: Check BPFTOOL env var in detect_bpftool_path()tools/ | +12 | 0 replies | Applied |
| 20/20 | selftests/bpf: Don't override SIGSEGV handler with ASANtools/ | +26 | 0 replies | Applied |
Reviews trailers per patch
13 of 20 patches have a Reviewed-by or Acked-by.
| Patch | Jiri Olsa | Eduard Zingerman | Mykyta Yatsenko |
|---|---|---|---|
| 1/20 | |||
| 2/20 | |||
| 3/20 | |||
| 4/20 | |||
| 5/20 | |||
| 6/20 | |||
| 7/20 | A-b | ||
| 8/20 | |||
| 9/20 | A-b | ||
| 10/20 | A-b | ||
| 11/20 | A-b | ||
| 12/20 | A-b | ||
| 13/20 | A-b | ||
| 14/20 | A-b | A-b | |
| 15/20 | A-b | ||
| 16/20 | A-b | ||
| 17/20 | A-b | ||
| 18/20 | A-b | ||
| 19/20 | A-b | ||
| 20/20 | A-b | A-b |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.
Cover letter [PATCH bpf v4 00/20] selftests/bpf: Fixes for userspace ASAN
This series includes various fixes aiming to enable test_progs run with userspace address sanitizer on BPF CI.
The first five patches add a simplified implementation of strscpy() to selftests/bpf and then replace strcpy/strncpy usages across the tests with it. See relevant discussions [1][2].
Patch #6 fixes the selftests/bpf/test_progs build with:
SAN_CFLAGS="-fsanitize=address -fno-omit-frame-pointer"
The subsequent patches fix bugs reported by the address sanitizer on attempt to run the tests.
[1] https://lore.kernel.org/bpf/CAADnVQ+9uw2_o388j43EWiAPdMB=3FLx2jq-9zRSvqrv-wgRag@mail.gmail.com/
[2] https://lore.kernel.org/bpf/[email protected]/
---
v3->v4:
- combine strscpy and ASAN series into one (Alexei)
- make the count arg of strscpy() optional via macro and fixup relevant call sites (Alexei)
- remove strscpy_cat() from this series (Alexei)
v3: https://lore.kernel.org/bpf/[email protected]/
v2->v3:
- rebase on top of "selftests/bpf: Add and use strscpy()"
- https://lore.kernel.org/bpf/[email protected]/
- uprobe_multi_test.c: memset static struct child at the beginning
of a test *and* zero out child->thread in release_child (patch #9,
Mykyta) - nits in test_sysctl.c (patch #11, Eduard)
- bpftool_helpers.c: update to use strscpy (patch #14, Alexei)
- add __asan_on_error handler to still dump test logs even with ASAN build (patch #15, Mykyta)
v2: https://lore.kernel.org/bpf/[email protected]/
v1->v2:
- rebase on bpf (v1 was targeting bpf-next)
- add ASAN flag handling in selftests/bpf/Makefile (Eduard)
- don't override SIGSEGV handler in test_progs with ASAN (Eduard)
- add error messages in detect_bpftool_path (Mykyta)
- various nits (Eduard, Jiri, Mykyta, Alexis)
v1: https://lore.kernel.org/bpf/[email protected]/
---
Ihor Solodrai (20):
selftests/bpf: Add simple strscpy() implementation selftests/bpf: Replace strcpy() calls with strscpy() selftests/bpf: Replace strncpy() with strscpy() selftests/bpf: Use strscpy in bpftool_helpers.c selftests/bpf: Use memcpy() for bounded non-NULL-terminated copies selftests/bpf: Pass through build flags to bpftool and resolve_btfids
resolve_btfids: Fix memory leaks reported by ASAN selftests/bpf: Add DENYLIST.asan
selftests/bpf: Refactor bpf_get_ksyms() trace helper selftests/bpf: Fix memory leaks in tests
selftests/bpf: Fix cleanup in check_fd_array_cnt__fd_array_too_big()
veristat: Fix a memory leak for preset ENUMERATOR selftests/bpf: Fix use-after-free in xdp_metadata test selftests/bpf: Fix double thread join in uprobe_multi_test selftests/bpf: Fix resource leaks caused by missing cleanups selftests/bpf: Free bpf_object in test_sysctl selftests/bpf: Fix array bounds warning in jit_disasm_helpers selftests/bpf: Fix out-of-bounds array access bugs reported by ASAN selftests/bpf: Check BPFTOOL env var in detect_bpftool_path() selftests/bpf: Don't override SIGSEGV handler with ASAN
tools/bpf/resolve_btfids/Makefile | 7 +- tools/bpf/resolve_btfids/main.c | 81 ++++++++++++------- tools/include/linux/args.h | 4 + tools/testing/selftests/bpf/DENYLIST.asan | 3 + tools/testing/selftests/bpf/Makefile | 13 ++- .../selftests/bpf/benchs/bench_trigger.c | 14 ++-- tools/testing/selftests/bpf/bpf_util.h | 45 ++++++++--- tools/testing/selftests/bpf/bpftool_helpers.c | 25 ++++-- tools/testing/selftests/bpf/cgroup_helpers.c | 2 +- .../selftests/bpf/jit_disasm_helpers.c | 18 ++--- tools/testing/selftests/bpf/network_helpers.c | 5 +- .../testing/selftests/bpf/prog_tests/align.c | 2 +- .../selftests/bpf/prog_tests/bpf_iter.c | 3 +- .../selftests/bpf/prog_tests/bpf_tcp_ca.c | 2 +- .../bpf/prog_tests/cgrp_local_storage.c | 4 +- .../selftests/bpf/prog_tests/ctx_rewrite.c | 6 +- .../testing/selftests/bpf/prog_tests/dynptr.c | 5 +- .../selftests/bpf/prog_tests/fd_array.c | 4 +- .../selftests/bpf/prog_tests/flow_dissector.c | 4 +- .../selftests/bpf/prog_tests/htab_update.c | 1 + .../bpf/prog_tests/kmem_cache_iter.c | 7 +- .../bpf/prog_tests/kprobe_multi_test.c | 12 ++- .../selftests/bpf/prog_tests/lwt_seg6local.c | 2 +- .../bpf/prog_tests/queue_stack_map.c | 4 +- .../selftests/bpf/prog_tests/setget_sockopt.c | 2 +- .../bpf/prog_tests/skc_to_unix_sock.c | 2 +- .../selftests/bpf/prog_tests/sockmap_basic.c | 28 +++---- .../selftests/bpf/prog_tests/sockmap_listen.c | 2 +- .../selftests/bpf/prog_tests/sockopt_sk.c | 2 +- .../bpf/prog_tests/struct_ops_private_stack.c | 4 +- .../bpf/prog_tests/task_local_data.h | 2 +- .../selftests/bpf/prog_tests/tc_opts.c | 6 +- .../selftests/bpf/prog_tests/tc_redirect.c | 2 +- .../selftests/bpf/prog_tests/test_sysctl.c | 3 + .../selftests/bpf/prog_tests/test_tc_tunnel.c | 5 +- .../selftests/bpf/prog_tests/test_veristat.c | 4 +- .../selftests/bpf/prog_tests/test_xsk.c | 24 +++++- .../bpf/prog_tests/uprobe_multi_test.c | 6 +- .../selftests/bpf/prog_tests/verifier_log.c | 2 +- .../selftests/bpf/prog_tests/xdp_metadata.c | 4 +- tools/testing/selftests/bpf/test_progs.c | 38 ++++++--- tools/testing/selftests/bpf/test_verifier.c | 2 +- tools/testing/selftests/bpf/testing_helpers.c | 1 + tools/testing/selftests/bpf/trace_helpers.c | 23 +++--- tools/testing/selftests/bpf/trace_helpers.h | 11 ++- tools/testing/selftests/bpf/veristat.c | 2 + tools/testing/selftests/bpf/xdp_features.c | 3 +- tools/testing/selftests/bpf/xdp_hw_metadata.c | 4 +- 48 files changed, 291 insertions(+), 164 deletions(-) create mode 100644 tools/testing/selftests/bpf/DENYLIST.asan
Signature · 1 line
2.53.0