Skip to content

selftests/bpf: Fixes for userspace ASAN

Ihor Solodrai bpf lkml 4 versions – Applied

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

  1. v4 Latest20 patches 4 repliesApplied 20/20
  2. v315 patches 7 repliesSuperseded
  3. v215 patches 12 repliesSuperseded
Earlier versions · 1
VersionPostedPatchesRepliesStatus
v114 patches32 repliesSuperseded

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 filesSizeRepliesApplied
1/20selftests/bpf: Add simple strscpy() implementationtools/include/linux/args.h tools/testing/selftests/bpf/bpf_util.h tools/testing/selftests/bpf/cgroup_helpers.c+37 -140 repliesApplied
2/20selftests/bpf: Replace strcpy() calls with strscpy()tools/testing/selftests/bpf/network_helpers.c tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c tools/testing/selftests/bpf/prog_tests/setget_sockopt.c +3 more+8 -70 repliesApplied
3/20selftests/bpf: Replace strncpy() with strscpy()tools/testing/selftests/bpf/network_helpers.c tools/testing/selftests/bpf/prog_tests/align.c tools/testing/selftests/bpf/prog_tests/bpf_iter.c +7 more+13 -153 repliesApplied
4/20selftests/bpf: Use strscpy in bpftool_helpers.ctools/testing/selftests/bpf/bpftool_helpers.c+7 -50 repliesApplied
5/20selftests/bpf: Use memcpy() for bounded non-NULL-terminated copiestools/testing/selftests/bpf/prog_tests/ctx_rewrite.c tools/testing/selftests/bpf/test_verifier.c+5 -30 repliesApplied
6/20selftests/bpf: Pass through build flags to bpftool and resolve_btfidstools/bpf/resolve_btfids/Makefile tools/testing/selftests/bpf/Makefile+14 -60 repliesApplied
7/20resolve_btfids: Fix memory leaks reported by ASANtools/bpf/resolve_btfids/main.c+54 -270 repliesApplied
8/20selftests/bpf: Add DENYLIST.asantools/testing/selftests/bpf/DENYLIST.asan+3 -00 repliesApplied
9/20selftests/bpf: Refactor bpf_get_ksyms() trace helpertools/testing/selftests/bpf/benchs/bench_trigger.c tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c tools/testing/selftests/bpf/trace_helpers.c +1 more+34 -261 replyApplied
10/20selftests/bpf: Fix memory leaks in teststools/testing/selftests/bpf/prog_tests/htab_update.c tools/testing/selftests/bpf/prog_tests/test_xsk.c tools/testing/selftests/bpf/testing_helpers.c+22 -40 repliesApplied
11/20selftests/bpf: Fix cleanup in check_fd_array_cnt__fd_array_too_big()tools/testing/selftests/bpf/prog_tests/fd_array.c+2 -20 repliesApplied
12/20veristat: Fix a memory leak for preset ENUMERATORtools/testing/selftests/bpf/veristat.c+2 -00 repliesApplied
13/20selftests/bpf: Fix use-after-free in xdp_metadata testtools/testing/selftests/bpf/prog_tests/xdp_metadata.c+2 -20 repliesApplied
14/20selftests/bpf: Fix double thread join in uprobe_multi_testtools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c+5 -10 repliesApplied
15/20selftests/bpf: Fix resource leaks caused by missing cleanupstools/testing/selftests/bpf/prog_tests/cgrp_local_storage.c tools/testing/selftests/bpf/prog_tests/dynptr.c tools/testing/selftests/bpf/prog_tests/sockmap_basic.c +4 more+29 -250 repliesApplied
16/20selftests/bpf: Free bpf_object in test_sysctltools/testing/selftests/bpf/prog_tests/test_sysctl.c+3 -00 repliesApplied
17/20selftests/bpf: Fix array bounds warning in jit_disasm_helperstools/testing/selftests/bpf/jit_disasm_helpers.c+9 -90 repliesApplied
18/20selftests/bpf: Fix out-of-bounds array access bugs reported by ASANtools/testing/selftests/bpf/prog_tests/kmem_cache_iter.c tools/testing/selftests/bpf/prog_tests/lwt_seg6local.c tools/testing/selftests/bpf/prog_tests/verifier_log.c+4 -70 repliesApplied
19/20selftests/bpf: Check BPFTOOL env var in detect_bpftool_path()tools/testing/selftests/bpf/bpftool_helpers.c+12 -10 repliesApplied
20/20selftests/bpf: Don't override SIGSEGV handler with ASANtools/testing/selftests/bpf/test_progs.c+26 -100 repliesApplied

Reviews trailers per patch

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

PatchJiri OlsaEduard ZingermanMykyta Yatsenko
1/20
2/20
3/20
4/20
5/20
6/20
7/20A-b
8/20
9/20A-b
10/20A-b
11/20A-b
12/20A-b
13/20A-b
14/20A-b A-b
15/20A-b
16/20A-b
17/20A-b
18/20A-b
19/20A-b
20/20A-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.

Read the v4 thread

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