selftests/bpf: Fixes for userspace ASAN
Subsystems (4)
Ihor Solodrai
reviewerv2 cover 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 patch 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.
---
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 (15):
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/testing/selftests/bpf/DENYLIST.asan | 3 + tools/testing/selftests/bpf/Makefile | 13 ++- .../selftests/bpf/benchs/bench_trigger.c | 14 ++-- tools/testing/selftests/bpf/bpftool_helpers.c | 19 ++++- .../selftests/bpf/jit_disasm_helpers.c | 18 ++--- .../bpf/prog_tests/cgrp_local_storage.c | 4 +- .../testing/selftests/bpf/prog_tests/dynptr.c | 5 +- .../selftests/bpf/prog_tests/fd_array.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 +- .../selftests/bpf/prog_tests/sockmap_basic.c | 28 +++---- .../selftests/bpf/prog_tests/sockmap_listen.c | 2 +- .../bpf/prog_tests/struct_ops_private_stack.c | 4 +- .../selftests/bpf/prog_tests/tc_opts.c | 6 +- .../selftests/bpf/prog_tests/test_sysctl.c | 14 +++- .../selftests/bpf/prog_tests/test_tc_tunnel.c | 5 +- .../selftests/bpf/prog_tests/test_xsk.c | 24 +++++- .../bpf/prog_tests/uprobe_multi_test.c | 1 + .../selftests/bpf/prog_tests/verifier_log.c | 2 +- .../selftests/bpf/prog_tests/xdp_metadata.c | 4 +- tools/testing/selftests/bpf/test_progs.c | 8 +- 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 + 29 files changed, 206 insertions(+), 119 deletions(-) create mode 100644 tools/testing/selftests/bpf/DENYLIST.asan
Signature · 1 line
2.53.0
Ihor Solodrai
reviewerPATCH v2 1/15 selftests/bpf: Pass through build flags to bpftool and resolve_btfids
EXTRA_* and SAN_* build flags were not correctly propagated to bpftool and resolve_btids when building selftests/bpf. This led to various build errors on attempt to build with SAN_CFLAGS="-fsanitize=address", for example.
Fix the makefiles to address this:
- Pass SAN_CFLAGS/SAN_LDFLAGS to bpftool and resolve_btfids build
- Propagate EXTRA_LDFLAGS to resolve_btfids link command
- Use pkg-config to detect zlib and zstd for resolve_btfids, similar libelf handling
Also check for ASAN flag in selftests/bpf/Makefile for convenience.
--- tools/bpf/resolve_btfids/Makefile | 7 +++++-- tools/testing/selftests/bpf/Makefile | 13 +++++++++---- 2 files changed, 14 insertions(+), 6 deletions(-)
tools/bpf/resolve_btfids/Makefile +5 -2
@@ -65,6 +65,9 @@ $(BPFOBJ): $(wildcard $(LIBBPF_SRC)/*.[ch] $(LIBBPF_SRC)/Makefile) | $(LIBBPF_OU LIBELF_FLAGS := $(shell $(HOSTPKG_CONFIG) libelf --cflags 2>/dev/null) LIBELF_LIBS := $(shell $(HOSTPKG_CONFIG) libelf --libs 2>/dev/null || echo -lelf) +ZLIB_LIBS := $(shell $(HOSTPKG_CONFIG) zlib --libs 2>/dev/null || echo -lz) +ZSTD_LIBS := $(shell $(HOSTPKG_CONFIG) libzstd --libs 2>/dev/null || echo -lzstd) + HOSTCFLAGS_resolve_btfids += -g \ -I$(srctree)/tools/include \ -I$(srctree)/tools/include/uapi \
@@ -73,7 +76,7 @@ HOSTCFLAGS_resolve_btfids += -g \ $(LIBELF_FLAGS) \ -Wall -Werror -LIBS = $(LIBELF_LIBS) -lz +LIBS = $(LIBELF_LIBS) $(ZLIB_LIBS) $(ZSTD_LIBS) export srctree OUTPUT HOSTCFLAGS_resolve_btfids Q HOSTCC HOSTLD HOSTAR include $(srctree)/tools/build/Makefile.include
@@ -83,7 +86,7 @@ $(BINARY_IN): fixdep FORCE prepare | $(OUTPUT) $(BINARY): $(BPFOBJ) $(SUBCMDOBJ) $(BINARY_IN) $(call msg,LINK,$@) - $(Q)$(HOSTCC) $(BINARY_IN) $(KBUILD_HOSTLDFLAGS) -o $@ $(BPFOBJ) $(SUBCMDOBJ) $(LIBS) + $(Q)$(HOSTCC) $(BINARY_IN) $(KBUILD_HOSTLDFLAGS) $(EXTRA_LDFLAGS) -o $@ $(BPFOBJ) $(SUBCMDOBJ) $(LIBS) clean_objects := $(wildcard $(OUTPUT)/*.o \ $(OUTPUT)/.*.o.cmd \
tools/testing/selftests/bpf/Makefile +9 -4
@@ -27,7 +27,11 @@ ifneq ($(wildcard $(GENHDR)),) endif BPF_GCC ?= $(shell command -v bpf-gcc;) +ifdef ASAN +SAN_CFLAGS ?= -fsanitize=address -fno-omit-frame-pointer +else SAN_CFLAGS ?= +endif SAN_LDFLAGS ?= $(SAN_CFLAGS) RELEASE ?= OPT_FLAGS ?= $(if $(RELEASE),-O2,-O0)
@@ -326,8 +330,8 @@ $(DEFAULT_BPFTOOL): $(wildcard $(BPFTOOLDIR)/*.[ch] $(BPFTOOLDIR)/Makefile) \ $(HOST_BPFOBJ) | $(HOST_BUILD_DIR)/bpftool $(Q)$(MAKE) $(submake_extras) -C $(BPFTOOLDIR) \ ARCH= CROSS_COMPILE= CC="$(HOSTCC)" LD="$(HOSTLD)" \ - EXTRA_CFLAGS='-g $(OPT_FLAGS) $(EXTRA_CFLAGS)' \ - EXTRA_LDFLAGS='$(EXTRA_LDFLAGS)' \ + EXTRA_CFLAGS='-g $(OPT_FLAGS) $(SAN_CFLAGS) $(EXTRA_CFLAGS)' \ + EXTRA_LDFLAGS='$(SAN_LDFLAGS) $(EXTRA_LDFLAGS)' \ OUTPUT=$(HOST_BUILD_DIR)/bpftool/ \ LIBBPF_OUTPUT=$(HOST_BUILD_DIR)/libbpf/ \ LIBBPF_DESTDIR=$(HOST_SCRATCH_DIR)/ \
@@ -338,8 +342,8 @@ $(CROSS_BPFTOOL): $(wildcard $(BPFTOOLDIR)/*.[ch] $(BPFTOOLDIR)/Makefile) \ $(BPFOBJ) | $(BUILD_DIR)/bpftool $(Q)$(MAKE) $(submake_extras) -C $(BPFTOOLDIR) \ ARCH=$(ARCH) CROSS_COMPILE=$(CROSS_COMPILE) \ - EXTRA_CFLAGS='-g $(OPT_FLAGS) $(EXTRA_CFLAGS)' \ - EXTRA_LDFLAGS='$(EXTRA_LDFLAGS)' \ + EXTRA_CFLAGS='-g $(OPT_FLAGS) $(SAN_CFLAGS) $(EXTRA_CFLAGS)' \ + EXTRA_LDFLAGS='$(SAN_LDFLAGS) $(EXTRA_LDFLAGS)' \ OUTPUT=$(BUILD_DIR)/bpftool/ \ LIBBPF_OUTPUT=$(BUILD_DIR)/libbpf/ \ LIBBPF_DESTDIR=$(SCRATCH_DIR)/ \
@@ -404,6 +408,7 @@ $(RESOLVE_BTFIDS): $(HOST_BPFOBJ) | $(HOST_BUILD_DIR)/resolve_btfids \ $(Q)$(MAKE) $(submake_extras) -C $(TOOLSDIR)/bpf/resolve_btfids \ CC="$(HOSTCC)" LD="$(HOSTLD)" AR="$(HOSTAR)" \ LIBBPF_INCLUDE=$(HOST_INCLUDE_DIR) \ + EXTRA_LDFLAGS='$(SAN_LDFLAGS) $(EXTRA_LDFLAGS)' \ OUTPUT=$(HOST_BUILD_DIR)/resolve_btfids/ BPFOBJ=$(HOST_BPFOBJ) # Get Clang's default includes on this system, as opposed to those seen by
Signature · 1 line
2.53.0
Ihor Solodrai
reviewerPATCH v2 2/15 resolve_btfids: Fix memory leaks reported by ASAN
In reply to Ihor SolodraiRunning resolve_btfids with ASAN reveals memory leaks in btf_id handling.
- Change get_id() to use a local buffer
- Make btf_id__add() strdup the name internally
- Add btf_id__free_all() that frees all nodese of a tree
- Call the cleanup function on exit for every tree
--- tools/bpf/resolve_btfids/main.c | 81 ++++++++++++++++++++++----------- 1 file changed, 54 insertions(+), 27 deletions(-)
tools/bpf/resolve_btfids/main.c +54 -27
@@ -226,7 +226,7 @@ static struct btf_id *btf_id__find(struct rb_root *root, const char *name) }static struct btf_id *__btf_id__add (struct rb_root *root, -char *name, +const char *name,enum btf_id_kind kind,bool unique) {
@@ -250,7 +250,11 @@ static struct btf_id *__btf_id__add(struct rb_root *root, id =zalloc (sizeof (*id));if (id) {pr_debug ("adding symbol %s\n" , name); - id->name = name; + id->name =strdup (name); +if (!id->name) { +free (id); +return NULL ; + } id->kind = kind;rb_link_node (&id->rb_node, parent, p);rb_insert_color (&id->rb_node, root);
@@ -258,17 +262,21 @@ static struct btf_id *__btf_id__add(struct rb_root *root,return id; } -static inline struct btf_id *btf_id__add (struct rb_root *root,char *name,enum btf_id_kind kind) +static inline struct btf_id *btf_id__add (struct rb_root *root, +const char *name, +enum btf_id_kind kind) {return __btf_id__add (root, name, kind, false); } -static inline struct btf_id *btf_id__add_unique (struct rb_root *root,char *name,enum btf_id_kind kind) +static inline struct btf_id *btf_id__add_unique (struct rb_root *root, +const char *name, +enum btf_id_kind kind) {return __btf_id__add (root, name, kind, true); } -static char *get_id (const char *prefix_end) +static int get_id (const char *prefix_end,char *buf,size_t buf_sz) {/* * __BTF_ID__func__vfs_truncate__0
@@ -277,28 +285,28 @@ static char *get_id(const char *prefix_end)*/ int len =strlen (prefix_end);int pos =sizeof ("__" ) -1 ; -char *p, *id; +char *p;if (pos >= len) -return NULL ; +return -1 ; - id =strdup (prefix_end + pos); -if (id) { -/* -* __BTF_ID__func__vfs_truncate__0 -* id = ^ -* -* cut the unique id part -*/ - p =strrchr (id,'_' ); - p--; -if (*p !='_' ) { -free (id); -return NULL ; - } - *p ='\0' ; - } -return id; +if (len - pos >= buf_sz) +return -1 ; + +strcpy (buf, prefix_end + pos); +/* +* __BTF_ID__func__vfs_truncate__0 +* buf = ^ +* +* cut the unique id part +*/ + p =strrchr (buf,'_' ); + p--; +if (*p !='_' ) +return -1 ; + *p ='\0' ; + +return 0 ; }static struct btf_id *add_set (struct object *obj,char *name,enum btf_id_kind kind)
@@ -335,10 +343,9 @@ static struct btf_id *add_set(struct object *obj, char *name, enum btf_id_kind kstatic struct btf_id *add_symbol (struct rb_root *root,char *name,size_t size) { -char *id; +char id[KSYM_NAME_LEN ]; - id =get_id (name + size); -if (!id) { +if (get_id (name + size, id,sizeof (id))) {pr_err ("FAILED to parse symbol name: %s\n" , name);return NULL ; }
@@ -346,6 +353,21 @@ static struct btf_id *add_symbol(struct rb_root *root, char *name, size_t size)return btf_id__add (root, id,BTF_ID_KIND_SYM ); } +static void btf_id__free_all (struct rb_root *root) +{ +struct rb_node *next; +struct btf_id *id; + + next =rb_first (root); +while (next) { + id = rb_entry(next, struct btf_id, rb_node); + next =rb_next (&id->rb_node); +rb_erase (&id->rb_node, root); +free (id->name); +free (id); + } +} +static void bswap_32_data (void *data,u32 nr_bytes) {u32 cnt, i;
@@ -1547,6 +1569,11 @@ int main(int argc, const char **argv) out:btf__free (obj.base_btf);btf__free (obj.btf); +btf_id__free_all (&obj.structs); +btf_id__free_all (&obj.unions); +btf_id__free_all (&obj.typedefs); +btf_id__free_all (&obj.funcs); +btf_id__free_all (&obj.sets);if (obj.efile.elf) {elf_end (obj.efile.elf);close (obj.efile.fd);
Signature · 1 line
2.53.0
Ihor Solodrai
reviewerPATCH v2 3/15 selftests/bpf: Add DENYLIST.asan
In reply to Ihor SolodraiAdd a denylist file for tests that should be skipped when built with userspace ASAN:
$ make ... SAN_CFLAGS="-fsanitize=address -fno-omit-frame-pointer"
Skip the following tests:
- *arena*: userspace ASAN does not understand BPF arena maps and gets confused particularly when map_extra is non-zero
- non-zero map_extra leads to mmap with MAP_FIXED, and ASAN treats this as an unknown memory region
- task_local_data: ASAN complains about "incorrect" aligned_alloc() usage, but it's intentional in the test
- uprobe_multi_test: very slow with ASAN enabled
--- tools/testing/selftests/bpf/DENYLIST.asan | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 tools/testing/selftests/bpf/DENYLIST.asan
tools/testing/selftests/bpf/DENYLIST.asan new file +3 -0
@@ -0,0 +1,3 @@ +*arena* +task_local_data +uprobe_multi_test
Signature · 1 line
2.53.0
Ihor Solodrai
reviewerPATCH v2 4/15 selftests/bpf: Refactor bpf_get_ksyms() trace helper
In reply to Ihor SolodraiASAN reported a memory leak in bpf_get_ksyms(): it allocates a struct ksyms internally and never frees it.
Move struct ksyms to trace_helpers.h and return it from the bpf_get_ksyms(), giving ownership to the caller. Add filtered_syms and filtered_cnt fields to the ksyms to hold the filtered array of symbols, previously returned by bpf_get_ksyms().
Fixup the call sites: kprobe_multi_test and bench_trigger.
--- .../selftests/bpf/benchs/bench_trigger.c | 14 ++++++----- .../bpf/prog_tests/kprobe_multi_test.c | 12 ++++------ tools/testing/selftests/bpf/trace_helpers.c | 23 ++++++++++--------- tools/testing/selftests/bpf/trace_helpers.h | 11 +++++++-- 4 files changed, 34 insertions(+), 26 deletions(-)
tools/testing/selftests/bpf/benchs/bench_trigger.c +8 -6
@@ -230,8 +230,8 @@ static void trigger_fentry_setup(void)static void attach_ksyms_all (struct bpf_program *empty,bool kretprobe) {LIBBPF_OPTS (bpf_kprobe_multi_opts, opts); -char **syms =NULL ; -size_t cnt =0 ; +struct bpf_link *link =NULL ; +struct ksyms *ksyms =NULL ;/* Some recursive functions will be skipped in * bpf_get_ksyms -> skip_entry, as they can introduce sufficient
@@ -241,16 +241,18 @@ static void attach_ksyms_all(struct bpf_program *empty, bool kretprobe)* So, don't run the kprobe-multi-all and kretprobe-multi-all on * a debug kernel. */ -if (bpf_get_ksyms (&syms, &cnt, true)) { +if (bpf_get_ksyms (&ksyms, true)) {fprintf (stderr,"failed to get ksyms\n" );exit (1 ); } - opts.syms = (const char **) syms; - opts.cnt = cnt; + opts.syms = (const char **)ksyms->filtered_syms; + opts.cnt = ksyms->filtered_cnt; opts.retprobe = kretprobe;/* attach empty to all the kernel functions except bpf_get_numa_node_id. */ -if (!bpf_program__attach_kprobe_multi_opts (empty,NULL , &opts)) { + link =bpf_program__attach_kprobe_multi_opts (empty,NULL , &opts); +free_kallsyms_local (ksyms); +if (!link) {fprintf (stderr,"failed to attach bpf_program__attach_kprobe_multi_opts to all\n" );exit (1 ); }
tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c +5 -7
@@ -456,25 +456,23 @@ static void test_kprobe_multi_bench_attach(bool kernel) {LIBBPF_OPTS (bpf_kprobe_multi_opts, opts);struct kprobe_multi_empty *skel =NULL ; -char **syms =NULL ; -size_t cnt =0 ; +struct ksyms *ksyms =NULL ; -if (!ASSERT_OK (bpf_get_ksyms (&syms, &cnt, kernel),"bpf_get_ksyms" )) +if (!ASSERT_OK (bpf_get_ksyms (&ksyms, kernel),"bpf_get_ksyms" ))return ; skel =kprobe_multi_empty__open_and_load ();if (!ASSERT_OK_PTR (skel,"kprobe_multi_empty__open_and_load" )) goto cleanup; - opts.syms = (const char **) syms; - opts.cnt = cnt; + opts.syms = (const char **)ksyms->filtered_syms; + opts.cnt = ksyms->filtered_cnt;do_bench_test (skel, &opts); cleanup:kprobe_multi_empty__destroy (skel); -if (syms) -free (syms); +free_kallsyms_local (ksyms); }static void test_kprobe_multi_bench_attach_addr (bool kernel)
tools/testing/selftests/bpf/trace_helpers.c +12 -11
@@ -24,12 +24,6 @@#define TRACEFS_PIPE "/sys/kernel/tracing/trace_pipe"#define DEBUGFS_PIPE "/sys/kernel/debug/tracing/trace_pipe" -struct ksyms { -struct ksym *syms; -size_t sym_cap; -size_t sym_cnt; -}; -static struct ksyms *ksyms;static pthread_mutex_t ksyms_mutex =PTHREAD_MUTEX_INITIALIZER ;
@@ -54,6 +48,8 @@ void free_kallsyms_local(struct ksyms *ksyms)if (!ksyms)return ; +free (ksyms->filtered_syms); +if (!ksyms->syms) {free (ksyms);return ;
@@ -610,7 +606,7 @@ static int search_kallsyms_compare(const void *p1, const struct ksym *p2)return compare_name (p1, p2->name); } -int bpf_get_ksyms (char ***symsp,size_t *cntp,bool kernel) +int bpf_get_ksyms (struct ksyms **ksymsp,bool kernel) {size_t cap =0 , cnt =0 ;char *name =NULL , *ksym_name, **syms =NULL ;
@@ -637,8 +633,10 @@ int bpf_get_ksyms(char ***symsp, size_t *cntp, bool kernel)else f =fopen ("/sys/kernel/debug/tracing/available_filter_functions" ,"r" ); -if (!f) +if (!f) { +free_kallsyms_local (ksyms);return -EINVAL ; + } map =hashmap__new (symbol_hash, symbol_equal,NULL );if (IS_ERR (map)) {
@@ -679,15 +677,18 @@ int bpf_get_ksyms(char ***symsp, size_t *cntp, bool kernel) syms[cnt++] = ksym_name; } - *symsp = syms; - *cntp = cnt; + ksyms->filtered_syms = syms; + ksyms->filtered_cnt = cnt; + *ksymsp = ksyms; error:free (name);fclose (f);hashmap__free (map); -if (err) +if (err) {free (syms); +free_kallsyms_local (ksyms); + }return err; }
tools/testing/selftests/bpf/trace_helpers.h +9 -2
@@ -23,7 +23,14 @@ struct ksym {long addr;char *name; }; -struct ksyms ; + +struct ksyms { +struct ksym *syms; +size_t sym_cap; +size_t sym_cnt; +char **filtered_syms; +size_t filtered_cnt; +};typedef int (*ksym_cmp_t )(const void *p1,const void *p2);typedef int (*ksym_search_cmp_t )(const void *p1,const struct ksym *p2);
@@ -53,7 +60,7 @@ ssize_t get_rel_offset(uintptr_t addr);int read_build_id (const char *path,char *build_id,size_t size); -int bpf_get_ksyms (char ***symsp,size_t *cntp,bool kernel); +int bpf_get_ksyms (struct ksyms **ksymsp,bool kernel);int bpf_get_addrs (unsigned long **addrsp,size_t *cntp,bool kernel);#endif
Signature · 1 line
2.53.0
Ihor Solodrai
reviewerPATCH v2 5/15 selftests/bpf: Fix memory leaks in tests
In reply to Ihor SolodraiFix trivial memory leaks detected by userspace ASAN:
- htab_update: free value buffer in test_reenter_update cleanup
- test_xsk: inline pkt_stream_replace() in testapp_stats_rx_full() and testapp_stats_fill_empty()
- testing_helpers: free buffer allocated by getline() in parse_test_list_file
--- .../selftests/bpf/prog_tests/htab_update.c | 1 + .../selftests/bpf/prog_tests/test_xsk.c | 24 +++++++++++++++---- tools/testing/selftests/bpf/testing_helpers.c | 1 + 3 files changed, 22 insertions(+), 4 deletions(-)
tools/testing/selftests/bpf/prog_tests/htab_update.c +1 -0
@@ -61,6 +61,7 @@ static void test_reenter_update(void)ASSERT_EQ (skel->bss->update_err, -EDEADLK ,"no reentrancy" ); out: +free (value);htab_update__destroy (skel); }
tools/testing/selftests/bpf/prog_tests/test_xsk.c +20 -4
@@ -2003,9 +2003,17 @@ int testapp_stats_tx_invalid_descs(struct test_spec *test)int testapp_stats_rx_full (struct test_spec *test) { -if (pkt_stream_replace (test,DEFAULT_UMEM_BUFFERS +DEFAULT_UMEM_BUFFERS /2 ,MIN_PKT_SIZE )) +struct pkt_stream *tmp; + + tmp =pkt_stream_generate (DEFAULT_UMEM_BUFFERS +DEFAULT_UMEM_BUFFERS /2 ,MIN_PKT_SIZE ); +if (!tmp) +return TEST_FAILURE ; + test->ifobj_tx->xsk->pkt_stream = tmp; + + tmp =pkt_stream_generate (DEFAULT_UMEM_BUFFERS ,MIN_PKT_SIZE ); +if (!tmp)return TEST_FAILURE ; - test->ifobj_rx->xsk->pkt_stream =pkt_stream_generate (DEFAULT_UMEM_BUFFERS ,MIN_PKT_SIZE ); + test->ifobj_rx->xsk->pkt_stream = tmp; test->ifobj_rx->xsk->rxqsize =DEFAULT_UMEM_BUFFERS ; test->ifobj_rx->release_rx = false;
@@ -2015,9 +2023,17 @@ int testapp_stats_rx_full(struct test_spec *test)int testapp_stats_fill_empty (struct test_spec *test) { -if (pkt_stream_replace (test,DEFAULT_UMEM_BUFFERS +DEFAULT_UMEM_BUFFERS /2 ,MIN_PKT_SIZE )) +struct pkt_stream *tmp; + + tmp =pkt_stream_generate (DEFAULT_UMEM_BUFFERS +DEFAULT_UMEM_BUFFERS /2 ,MIN_PKT_SIZE ); +if (!tmp) +return TEST_FAILURE ; + test->ifobj_tx->xsk->pkt_stream = tmp; + + tmp =pkt_stream_generate (DEFAULT_UMEM_BUFFERS ,MIN_PKT_SIZE ); +if (!tmp)return TEST_FAILURE ; - test->ifobj_rx->xsk->pkt_stream =pkt_stream_generate (DEFAULT_UMEM_BUFFERS ,MIN_PKT_SIZE ); + test->ifobj_rx->xsk->pkt_stream = tmp; test->ifobj_rx->use_fill_ring = false; test->ifobj_rx->validation_func = validate_fill_empty;
tools/testing/selftests/bpf/testing_helpers.c +1 -0
@@ -212,6 +212,7 @@ int parse_test_list_file(const char *path,break ; } +free (buf);fclose (f);return err; }
Signature · 1 line
2.53.0
Re: [PATCH bpf v2 05/15] selftests/bpf: Fix memory leaks in tests
Quoted 9 lines · Ihor Solodrai
Fix trivial memory leaks detected by userspace ASAN:
-htab_update: free value buffer intest_reenter_updatecleanup
-test_xsk: inlinepkt_stream_replace()intestapp_stats_rx_full()andtestapp_stats_fill_empty()
-testing_helpers: free buffer allocated bygetline()inparse_test_list_fileSigned-off-by Ihor Solodrai <[email protected]>---
[...]
Ihor Solodrai
reviewerPATCH v2 6/15 selftests/bpf: Fix cleanup in check_fd_array_cnt__fd_array_too_big()
In reply to Ihor SolodraiThe Close() macro uses the passed in expression three times, which leads to repeated execution in case it has side effects. That is, Close(i--) would decrement i three times.
ASAN caught a stack-buffer-undeflow error at a point where this was overlooked. Fix it.
--- tools/testing/selftests/bpf/prog_tests/fd_array.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/testing/selftests/bpf/prog_tests/fd_array.c +2 -2
@@ -412,8 +412,8 @@ static void check_fd_array_cnt__fd_array_too_big(void)ASSERT_EQ (prog_fd, -E2BIG ,"prog should have been rejected with -E2BIG" ); cleanup_fds: -while (i >0 ) -Close (extra_fds[--i]); +while (i-- >0 ) +Close (extra_fds[i]); }void test_fd_array_cnt (void )
Signature · 1 line
2.53.0
Ihor Solodrai
reviewerPATCH v2 7/15 veristat: Fix a memory leak for preset ENUMERATOR
In reply to Ihor SolodraiASAN detected a memory leak in veristat. The cleanup code handling ENUMERATOR value missed freeing strdup-ed svalue. Fix it.
--- tools/testing/selftests/bpf/veristat.c | 2 ++ 1 file changed, 2 insertions(+)
tools/testing/selftests/bpf/veristat.c +2 -0
@@ -3378,6 +3378,8 @@ int main(int argc, char **argv) } }free (env.presets[i].atoms); +if (env.presets[i].value.type ==ENUMERATOR ) +free (env.presets[i].value.svalue); }free (env.presets);return -err;
Signature · 1 line
2.53.0
Ihor Solodrai
reviewerPATCH v2 8/15 selftests/bpf: Fix use-after-free in xdp_metadata test
In reply to Ihor SolodraiASAN reported a use-after-free in close_xsk().
The xsk->socket internally references xsk->umem via socket->ctx->umem, so the socket must be deleted before the umem. Fix the order of operations in close_xsk().
--- tools/testing/selftests/bpf/prog_tests/xdp_metadata.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/testing/selftests/bpf/prog_tests/xdp_metadata.c +2 -2
@@ -126,10 +126,10 @@ static int open_xsk(int ifindex, struct xsk *xsk)static void close_xsk (struct xsk *xsk) { -if (xsk->umem) -xsk_umem__delete (xsk->umem);if (xsk->socket)xsk_socket__delete (xsk->socket); +if (xsk->umem) +xsk_umem__delete (xsk->umem);munmap (xsk->umem_area,UMEM_SIZE ); }
Signature · 1 line
2.53.0
Ihor Solodrai
reviewerPATCH v2 9/15 selftests/bpf: Fix double thread join in uprobe_multi_test
In reply to Ihor SolodraiASAN reported a "joining already joined thread" error. The release_child() may be called multiple times for the same struct child.
Fix with a memset(0) call at the end of release_child().
--- tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c | 1 + 1 file changed, 1 insertion(+)
tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c +1 -0
@@ -68,6 +68,7 @@ static void release_child(struct child *child)close (child->c2p[1 ]);if (child->pid >0 )waitpid (child->pid, &child_status,0 ); +memset (child,0 ,sizeof (*child)); }static void kick_child (struct child *child)
Signature · 1 line
2.53.0
Ihor Solodrai
reviewerRe: [PATCH bpf v2 09/15] selftests/bpf: Fix double thread join in uprobe_multi_test
Quoted 18 lines · Ihor Solodrai
ASAN reported a "joining already joined thread" error. The
release_child()may be called multiple times for the same struct child.Fix with a memset(0) call at the end of
release_child().Acked-by Mykyta Yatsenko <[email protected]>Acked-by Jiri Olsa <[email protected]>Signed-off-by Ihor Solodrai <[email protected]>--- tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c | 1 + 1 file changed, 1 insertion(+)tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c +0
-0
tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c static void release_child(struct child *child) · line 71
Quoted 4 lines
tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c +1
-0@@ -68,6 +68,7 @@ static void release_child(struct child *child)close (child->c2p[1 ]);if (child->pid >0 )waitpid (child->pid, &child_status,0 ); +memset (child,0 ,sizeof (*child));
The CI is failing because of this change.
Apparently, there are asserts on child object after it's released in kick_child(), so we can't just memset it (without changing the test logic). The previous version of the fix [1], resetting only child->thread, is more appropriate I think.
I missed this because uprobe_multi is in DENYLIST.asan
I'll wait a bit in case there is more feedback and send a v3.
Quoted 3 lines
tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c +0
-0}static void kick_child (struct child *child)
Re: [PATCH bpf v2 09/15] selftests/bpf: Fix double thread join in uprobe_multi_test
Quoted 25 lines · Ihor Solodrai
Quoted 18 lines · Ihor Solodrai
ASAN reported a "joining already joined thread" error. The
release_child()may be called multiple times for the same struct child.Fix with a memset(0) call at the end of
release_child().Acked-by Mykyta Yatsenko <[email protected]>Acked-by Jiri Olsa <[email protected]>Signed-off-by Ihor Solodrai <[email protected]>--- tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c | 1 + 1 file changed, 1 insertion(+)tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c +0
-0tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c static void release_child(struct child *child) · line 71
Quoted 4 lines
tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c +1
-0@@ -68,6 +68,7 @@ static void release_child(struct child *child)close (child->c2p[1 ]);if (child->pid >0 )waitpid (child->pid, &child_status,0 ); +memset (child,0 ,sizeof (*child));The CI is failing because of this change.
Quoted 8 lines
Apparently, there are asserts on child object after it's released in
kick_child(), so we can't just memset it (without changing the test logic). The previous version of the fix [1], resetting onlychild->thread, is more appropriate I think.I missed this because
uprobe_multiis in DENYLIST.asanI'll wait a bit in case there is more feedback and send a v3.
I think it's more logical to memset it before the test run, not after (in release_child()).
Quoted 8 lines
[1] https://lore.kernel.org/bpf/[email protected]/
Quoted 3 lines
tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c +0
-0}static void kick_child (struct child *child)
Re: [PATCH bpf v2 09/15] selftests/bpf: Fix double thread join in uprobe_multi_testg
In reply to Ihor SolodraiQuoted 14 lines · Ihor Solodrai
Quoted 13 lines · Ihor Solodrai
ASAN reported a "joining already joined thread" error. The
release_child()may be called multiple times for the same struct child.Fix with a memset(0) call at the end of
release_child().Acked-by Mykyta Yatsenko <[email protected]>Acked-by Jiri Olsa <[email protected]>Signed-off-by Ihor Solodrai <[email protected]>--- tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c | 1 + 1 file changed, 1 insertion(+)
Quoted 11 lines
tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c static void release_child(struct child *child) · line 71
Quoted 9 lines
tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c +1
-0@@ -68,6 +68,7 @@ static void release_child(struct child *child)close (child->c2p[1 ]);if (child->pid >0 )waitpid (child->pid, &child_status,0 ); +memset (child,0 ,sizeof (*child));The CI is failing because of this change.
it's on that child->pid,child->tid check in uprobe_multi_test_run?
Quoted 9 lines
Apparently, there are asserts on child object after it's released in
kick_child(), so we can't just memset it (without changing the test logic). The previous version of the fix [1], resetting onlychild->thread, is more appropriate I think.I missed this because
uprobe_multiis in DENYLIST.asanI'll wait a bit in case there is more feedback and send a v3.
I think we should somehow separate the thread logic from the child to make the test more clear.. I'll take a look
for now zero-ing the thread, so there's no double join makes sense to me
thanks,
jirka
Quoted 8 lines
[1] https://lore.kernel.org/bpf/[email protected]/
Quoted 3 lines
tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c +0
-0}static void kick_child (struct child *child)
Ihor Solodrai
reviewerPATCH v2 10/15 selftests/bpf: Fix resource leaks caused by missing cleanups
In reply to Ihor SolodraiASAN reported a number of resource leaks:
- Add missing *__destroy(skel) calls
- Replace bpf_link__detach() with bpf_link__destroy() where appropriate
- cgrp_local_storage: Add bpf_link__destroy() when bpf_iter_create fails
- dynptr: Add missing bpf_object__close()
--- .../bpf/prog_tests/cgrp_local_storage.c | 4 ++- .../testing/selftests/bpf/prog_tests/dynptr.c | 5 +++- .../selftests/bpf/prog_tests/sockmap_basic.c | 28 +++++++++---------- .../selftests/bpf/prog_tests/sockmap_listen.c | 2 +- .../bpf/prog_tests/struct_ops_private_stack.c | 4 +-- .../selftests/bpf/prog_tests/tc_opts.c | 6 ++-- .../selftests/bpf/prog_tests/test_tc_tunnel.c | 5 +++- 7 files changed, 29 insertions(+), 25 deletions(-)
tools/testing/selftests/bpf/prog_tests/cgrp_local_storage.c +3 -1
@@ -202,7 +202,7 @@ static void test_cgroup_iter_sleepable(int cgroup_fd, __u64 cgroup_id) iter_fd =bpf_iter_create (bpf_link__fd (link));if (!ASSERT_GE (iter_fd,0 ,"iter_create" )) - goto out; + goto out_link;/* trigger the program run */ (void )read (iter_fd, buf,sizeof (buf));
@@ -210,6 +210,8 @@ static void test_cgroup_iter_sleepable(int cgroup_fd, __u64 cgroup_id)ASSERT_EQ (skel->bss->cgroup_id, cgroup_id,"cgroup_id" );close (iter_fd); +out_link: +bpf_link__destroy (link); out:cgrp_ls_sleepable__destroy (skel); }
tools/testing/selftests/bpf/prog_tests/dynptr.c +4 -1
@@ -137,11 +137,14 @@ static void verify_success(const char *prog_name, enum test_setup_type setup_typ ); link =bpf_program__attach (prog); -if (!ASSERT_OK_PTR (link,"bpf_program__attach" )) +if (!ASSERT_OK_PTR (link,"bpf_program__attach" )) { +bpf_object__close (obj); goto cleanup; + } err =bpf_prog_test_run_opts (aux_prog_fd, &topts);bpf_link__destroy (link); +bpf_object__close (obj);if (!ASSERT_OK (err,"test_run" )) goto cleanup;
tools/testing/selftests/bpf/prog_tests/sockmap_basic.c +14 -14
@@ -204,7 +204,7 @@ static void test_skmsg_helpers_with_link(enum bpf_map_type map_type)/* Fail since bpf_link for the same prog type has been created. */ link2 =bpf_program__attach_sockmap (prog_clone, map);if (!ASSERT_ERR_PTR (link2,"bpf_program__attach_sockmap" )) { -bpf_link__detach (link2); +bpf_link__destroy (link2); goto out; }
@@ -230,7 +230,7 @@ static void test_skmsg_helpers_with_link(enum bpf_map_type map_type)if (!ASSERT_OK (err,"bpf_link_update" )) goto out; out: -bpf_link__detach (link); +bpf_link__destroy (link);test_skmsg_load_helpers__destroy (skel); }
@@ -417,7 +417,7 @@ static void test_sockmap_skb_verdict_attach_with_link(void)if (!ASSERT_OK_PTR (link,"bpf_program__attach_sockmap" )) goto out; -bpf_link__detach (link); +bpf_link__destroy (link); err =bpf_prog_attach (bpf_program__fd (prog), map,BPF_SK_SKB_STREAM_VERDICT ,0 );if (!ASSERT_OK (err,"bpf_prog_attach" ))
@@ -426,7 +426,7 @@ static void test_sockmap_skb_verdict_attach_with_link(void)/* Fail since attaching with the same prog/map has been done. */ link =bpf_program__attach_sockmap (prog, map);if (!ASSERT_ERR_PTR (link,"bpf_program__attach_sockmap" )) -bpf_link__detach (link); +bpf_link__destroy (link); err =bpf_prog_detach2 (bpf_program__fd (prog), map,BPF_SK_SKB_STREAM_VERDICT );if (!ASSERT_OK (err,"bpf_prog_detach2" ))
@@ -747,13 +747,13 @@ static void test_sockmap_skb_verdict_peek_with_link(void)test_sockmap_skb_verdict_peek_helper (map);ASSERT_EQ (pass->bss->clone_called,1 ,"clone_called" ); out: -bpf_link__detach (link); +bpf_link__destroy (link);test_sockmap_pass_prog__destroy (pass); }static void test_sockmap_unconnected_unix (void ) { -int err, map, stream =0 , dgram =0 , zero =0 ; +int err, map, stream =-1 , dgram =-1 , zero =0 ;struct test_sockmap_pass_prog *skel; skel =test_sockmap_pass_prog__open_and_load ();
@@ -764,22 +764,22 @@ static void test_sockmap_unconnected_unix(void) stream =xsocket (AF_UNIX ,SOCK_STREAM ,0 );if (stream <0 ) -return ; + goto out; dgram =xsocket (AF_UNIX ,SOCK_DGRAM ,0 ); -if (dgram <0 ) { -close (stream); -return ; - } +if (dgram <0 ) + goto out; err =bpf_map_update_elem (map, &zero, &stream,BPF_ANY ); -ASSERT_ERR (err,"bpf_map_update_elem(stream)" ); +if (!ASSERT_ERR (err,"bpf_map_update_elem(stream)" )) + goto out; err =bpf_map_update_elem (map, &zero, &dgram,BPF_ANY );ASSERT_OK (err,"bpf_map_update_elem(dgram)" ); - +out:close (stream);close (dgram); +test_sockmap_pass_prog__destroy (skel); }static void test_sockmap_many_socket (void )
@@ -1027,7 +1027,7 @@ static void test_sockmap_skb_verdict_vsock_poll(void)if (xrecv_nonblock (conn, &buf,1 ,0 ) !=1 )FAIL ("xrecv_nonblock" ); detach: -bpf_link__detach (link); +bpf_link__destroy (link); close:xclose (conn);xclose (peer);
tools/testing/selftests/bpf/prog_tests/sockmap_listen.c +1 -1
@@ -899,7 +899,7 @@ static void test_msg_redir_to_listening_with_link(struct test_sockmap_listen *skredir_to_listening (family, sotype, sock_map, verdict_map,REDIR_EGRESS ); -bpf_link__detach (link); +bpf_link__destroy (link); }static void redir_partial (int family,int sotype,int sock_map,int parser_map)
tools/testing/selftests/bpf/prog_tests/struct_ops_private_stack.c +1 -3
@@ -54,9 +54,7 @@ static void test_private_stack_fail(void) } err =struct_ops_private_stack_fail__load (skel); -if (!ASSERT_ERR (err,"struct_ops_private_stack_fail__load" )) - goto cleanup; -return ; +ASSERT_ERR (err,"struct_ops_private_stack_fail__load" ); cleanup:struct_ops_private_stack_fail__destroy (skel);
tools/testing/selftests/bpf/prog_tests/tc_opts.c +2 -4
@@ -1360,10 +1360,8 @@ static void test_tc_opts_dev_cleanup_target(int target)assert_mprog_count_ifindex (ifindex, target,4 ); -ASSERT_OK (system ("ip link del dev tcx_opts1" ),"del veth" ); -ASSERT_EQ (if_nametoindex ("tcx_opts1" ),0 ,"dev1_removed" ); -ASSERT_EQ (if_nametoindex ("tcx_opts2" ),0 ,"dev2_removed" ); -return ; + goto cleanup; + cleanup3: err =bpf_prog_detach_opts (fd3, loopback, target, &optd);ASSERT_OK (err,"prog_detach" );
tools/testing/selftests/bpf/prog_tests/test_tc_tunnel.c +4 -1
@@ -699,7 +699,7 @@ void test_tc_tunnel(void)return ;if (!ASSERT_OK (setup (),"global setup" )) -return ; + goto out;for (i =0 ; i <ARRAY_SIZE (subtests_cfg); i++) { cfg = &subtests_cfg[i];
@@ -711,4 +711,7 @@ void test_tc_tunnel(void)subtest_cleanup (cfg); }cleanup (); + +out: +test_tc_tunnel__destroy (skel); }
Signature · 1 line
2.53.0
Ihor Solodrai
reviewerPATCH v2 11/15 selftests/bpf: Free bpf_object in test_sysctl
In reply to Ihor SolodraiASAN reported a resource leak due to the bpf_object not being tracked in test_sysctl. Add obj field to struct sysctl_test to properly clean up bpf_object if a program was loaded from a file.
--- .../testing/selftests/bpf/prog_tests/test_sysctl.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
tools/testing/selftests/bpf/prog_tests/test_sysctl.c +10 -4
@@ -27,6 +27,7 @@ struct sysctl_test {OP_EPERM ,SUCCESS , } result; +struct bpf_object *obj; }; static struct sysctl_test tests[] = {
@@ -1471,14 +1472,16 @@ static int load_sysctl_prog_file(struct sysctl_test *test)return -1 ; } + test->obj = obj;return prog_fd; }static int load_sysctl_prog (struct sysctl_test *test,const char *sysctl_path) { -return test->prog_file - ?load_sysctl_prog_file (test) - :load_sysctl_prog_insns (test, sysctl_path); +if (test->prog_file) +return load_sysctl_prog_file (test); + test->obj =NULL ; +return load_sysctl_prog_insns (test, sysctl_path); } static int access_sysctl(const char *sysctl_path,
@@ -1573,7 +1576,10 @@ static int run_test_case(int cgfd, struct sysctl_test *test)/* Detaching w/o checking return code: best effort attempt. */ if (progfd !=-1 )bpf_prog_detach (cgfd, atype); -close (progfd); +if (test->obj) +bpf_object__close (test->obj); +else if (progfd !=-1 ) +close (progfd);printf ("[%s]\n" , err ?"FAIL" :"PASS" );return err; }
Signature · 1 line
2.53.0
Re: [PATCH bpf v2 11/15] selftests/bpf: Free bpf_object in test_sysctl
Quoted 6 lines · Ihor Solodrai
ASAN reported a resource leak due to the
bpf_objectnot being tracked intest_sysctl. Add obj field to structsysctl_testto properly clean upbpf_objectif a program was loaded from a file.Signed-off-by Ihor Solodrai <[email protected]>---
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/test_sysctl.c +0
-0@@ -1471,14 +1472,16 @@ static int load_sysctl_prog_file(struct sysctl_test *test) return -1; }tools/testing/selftests/bpf/prog_tests/test_sysctl.c +1
-0+ test->obj = obj;return
prog_fd;
}
static intload_sysctl_prog(struct sysctl_test *test, const char *sysctl_path){
tools/testing/selftests/bpf/prog_tests/test_sysctl.c static int load_sysctl_prog_file(struct sysctl_test *test) · line 1483
Quoted 6 lines
tools/testing/selftests/bpf/prog_tests/test_sysctl.c +3
-3-return test->prog_file - ?load_sysctl_prog_file (test) - :load_sysctl_prog_insns (test, sysctl_path); +if (test->prog_file) +return load_sysctl_prog_file (test); + test->obj =NULL ;
Nit: is this necessary? The way tests is defined ->obj will be NULL anyway.
Looks a bit asymmetrical.
tools/testing/selftests/bpf/prog_tests/test_sysctl.c static int run_test_case(int cgfd, struct sysctl_test *test) · line 1582
Quoted 13 lines
tools/testing/selftests/bpf/prog_tests/test_sysctl.c +1
-0+return load_sysctl_prog_insns (test, sysctl_path);}
static int access_sysctl(const char*sysctl_path,tools/testing/selftests/bpf/prog_tests/test_sysctl.c +4
-1@@ -1573,7 +1576,10 @@ static int run_test_case(int cgfd, struct sysctl_test *test) /* Detaching w/o checking return code: best effort attempt. */ if (progfd != -1) bpf_prog_detach(cgfd, atype); -close (progfd); +if (test->obj) +bpf_object__close (test->obj); +else if (progfd !=-1 ) +close (progfd);
Nit: close(-1) works fine, as well as bpf_object__close(NULL),
so there is no need for 'if' statements here.
Quoted 3 lines
tools/testing/selftests/bpf/prog_tests/test_sysctl.c +0
-0printf("[%s]\n", err ? "FAIL" : "PASS"); return err; }
Ihor Solodrai
reviewerPATCH v2 12/15 selftests/bpf: Fix array bounds warning in jit_disasm_helpers
In reply to Ihor SolodraiCompiler cannot infer upper bound for labels.cnt and warns about potential buffer overflow in snprintf. Add an explicit bounds check (... && i < MAX_LOCAL_LABELS) in the loop condition to fix the warning.
--- .../testing/selftests/bpf/jit_disasm_helpers.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
tools/testing/selftests/bpf/jit_disasm_helpers.c +9 -9
@@ -122,15 +122,15 @@ static int disasm_one_func(FILE *text_out, uint8_t *image, __u32 len) pc += cnt; }qsort (labels.pcs, labels.cnt,sizeof (*labels.pcs), cmp_u32); -for (i =0 ; i < labels.cnt; ++i) -/* gcc is unable to infer upper bound for labels.cnt and assumes -* it to be U32_MAX. U32_MAX takes 10 decimal digits. -* snprintf below prints into labels.names[*], -* which has space only for two digits and a letter. -* To avoid truncation warning use (i % MAX_LOCAL_LABELS), -* which informs gcc about printed value upper bound. -*/ -snprintf (labels.names[i],sizeof (labels.names[i]),"L%d" , i %MAX_LOCAL_LABELS ); +/* gcc is unable to infer upper bound for labels.cnt and +* assumes it to be U32_MAX. U32_MAX takes 10 decimal digits. +* snprintf below prints into labels.names[*], which has space +* only for two digits and a letter. To avoid truncation +* warning use (i < MAX_LOCAL_LABELS), which informs gcc about +* printed value upper bound. +*/ +for (i =0 ; i < labels.cnt && i <MAX_LOCAL_LABELS ; ++i) +snprintf (labels.names[i],sizeof (labels.names[i]),"L%d" , i);/* now print with labels */ labels.print_phase = true;
Signature · 1 line
2.53.0
Ihor Solodrai
reviewerPATCH v2 13/15 selftests/bpf: Fix out-of-bounds array access bugs reported by ASAN
In reply to Ihor Solodrai- kmem_cache_iter: remove unnecessary debug output
- lwt_seg6local: change the type of foobar to char[]
- the sizeof(foobar) returned the pointer size and not a string length as intended
- verifier_log: increase prog_name buffer size in verif_log_subtest()
- compiler has a conservative estimate of fixed_log_sz value, making ASAN complain on snprint() call
--- tools/testing/selftests/bpf/prog_tests/kmem_cache_iter.c | 7 ++----- tools/testing/selftests/bpf/prog_tests/lwt_seg6local.c | 2 +- tools/testing/selftests/bpf/prog_tests/verifier_log.c | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-)
tools/testing/selftests/bpf/prog_tests/kmem_cache_iter.c +2 -5
@@ -104,11 +104,8 @@ void test_kmem_cache_iter(void)if (!ASSERT_GE (iter_fd,0 ,"iter_create" )) goto destroy; -memset (buf,0 ,sizeof (buf)); -while (read (iter_fd, buf,sizeof (buf)) >0 ) { -/* Read out all contents */ -printf ("%s" , buf); - } +while (read (iter_fd, buf,sizeof (buf)) >0 ) + ;/* Read out all contents */ /* Next reads should return 0 */ ASSERT_EQ (read (iter_fd, buf,sizeof (buf)),0 ,"read" );
tools/testing/selftests/bpf/prog_tests/lwt_seg6local.c +1 -1
@@ -117,7 +117,7 @@ void test_lwt_seg6local(void)const char *ns1 =NETNS_BASE "1" ;const char *ns6 =NETNS_BASE "6" ;struct nstoken *nstoken =NULL ; -const char *foobar ="foobar" ; +const char foobar[] ="foobar" ;ssize_t bytes;int sfd, cfd;char buf[7 ];
tools/testing/selftests/bpf/prog_tests/verifier_log.c +1 -1
@@ -47,7 +47,7 @@ static int load_prog(struct bpf_prog_load_opts *opts, bool expect_load_error)static void verif_log_subtest (const char *name,bool expect_load_error,int log_level) {LIBBPF_OPTS (bpf_prog_load_opts, opts); -char *exp_log, prog_name[16 ], op_name[32 ]; +char *exp_log, prog_name[24 ], op_name[32 ];struct test_log_buf *skel;struct bpf_program *prog;size_t fixed_log_sz;
Signature · 1 line
2.53.0
Ihor Solodrai
reviewerPATCH v2 14/15 selftests/bpf: Check BPFTOOL env var in detect_bpftool_path()
In reply to Ihor SolodraiThe bpftool_maps_access and bpftool_metadata tests may fail on BPF CI with "command not found", depending on a workflow.
This happens because detect_bpftool_path() only checks two hardcoded relative paths:
- ./tools/sbin/bpftool
- ../tools/sbin/bpftool
Add support for a BPFTOOL environment variable that allows specifying the exact path to the bpftool binary.
Also replace strncpy() with snprintf() for proper null-termination.
--- tools/testing/selftests/bpf/bpftool_helpers.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
tools/testing/selftests/bpf/bpftool_helpers.c +15 -4
@@ -1,5 +1,6 @@// SPDX-License-Identifier: GPL-2.0-only #include "bpftool_helpers.h" +#include <stdio.h> #include <unistd.h> #include <string.h> #include <stdbool.h>
@@ -12,13 +13,24 @@static int detect_bpftool_path (char *buffer) {char tmp[BPFTOOL_PATH_MAX_LEN ]; +const char *env_path; + +/* First, check if BPFTOOL environment variable is set */ + env_path =getenv ("BPFTOOL" ); +if (env_path &&access (env_path,X_OK ) ==0 ) { +snprintf (buffer,BPFTOOL_PATH_MAX_LEN ,"%s" , env_path); +return 0 ; + }else if (env_path) { +fprintf (stderr,"bpftool '%s' doesn't exist or is not executable\n" , env_path); +return 1 ; + }/* Check default bpftool location (will work if we are running the * default flavor of test_progs) */ snprintf (tmp,BPFTOOL_PATH_MAX_LEN ,"./%s" ,BPFTOOL_DEFAULT_PATH );if (access (tmp,X_OK ) ==0 ) { -strncpy (buffer, tmp,BPFTOOL_PATH_MAX_LEN ); +snprintf (buffer,BPFTOOL_PATH_MAX_LEN ,"%s" , tmp);return 0 ; }
@@ -27,11 +39,11 @@ static int detect_bpftool_path(char *buffer)*/ snprintf (tmp,BPFTOOL_PATH_MAX_LEN ,"../%s" ,BPFTOOL_DEFAULT_PATH );if (access (tmp,X_OK ) ==0 ) { -strncpy (buffer, tmp,BPFTOOL_PATH_MAX_LEN ); +snprintf (buffer,BPFTOOL_PATH_MAX_LEN ,"%s" , tmp);return 0 ; } -/* Failed to find bpftool binary */ +fprintf (stderr,"Failed to detect bpftool path, use BPFTOOL env var to override\n" );return 1 ; }
@@ -71,4 +83,3 @@ int get_bpftool_command_output(char *args, char *output_buf, size_t output_max_l {return run_command (args, output_buf, output_max_len); } -
Signature · 1 line
2.53.0
Re: [PATCH bpf v2 14/15] selftests/bpf: Check BPFTOOL env var in detect_bpftool_path()
Quoted 7 lines · Ihor Solodrai
The
bpftool_maps_accessandbpftool_metadatatests may fail on BPF CI with "command not found", depending on a workflow.
This happens becausedetect_bpftool_path()only checks two hardcoded relative paths:
-./tools/sbin/bpftool
- ../tools/sbin/bpftool
Quoted 6 lines
Add support for a BPFTOOL environment variable that allows specifying the exact path to the bpftool binary.
Also replace
strncpy()withsnprintf()for proper null-termination.Signed-off-by Ihor Solodrai <[email protected]>
Quoted 60 lines
--- tools/testing/selftests/bpf/bpftool_helpers.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)tools/testing/selftests/bpf/bpftool_helpers.c +15
-4@@ -1,5 +1,6 @@// SPDX-License-Identifier: GPL-2.0-only #include "bpftool_helpers.h" +#include <stdio.h> #include <unistd.h> #include <string.h> #include <stdbool.h> @@ -12,13 +13,24 @@static int detect_bpftool_path (char *buffer) {char tmp[BPFTOOL_PATH_MAX_LEN ]; +const char *env_path; + +/* First, check if BPFTOOL environment variable is set */ + env_path =getenv ("BPFTOOL" ); +if (env_path &&access (env_path,X_OK ) ==0 ) { +snprintf (buffer,BPFTOOL_PATH_MAX_LEN ,"%s" , env_path); +return 0 ; + }else if (env_path) { +fprintf (stderr,"bpftool '%s' doesn't exist or is not executable\n" , env_path); +return 1 ; + }/* Check default bpftool location (will work if we are running the * default flavor of test_progs) */ snprintf (tmp,BPFTOOL_PATH_MAX_LEN ,"./%s" ,BPFTOOL_DEFAULT_PATH );if (access (tmp,X_OK ) ==0 ) { -strncpy (buffer, tmp,BPFTOOL_PATH_MAX_LEN ); +snprintf (buffer,BPFTOOL_PATH_MAX_LEN ,"%s" , tmp);return 0 ; }@@ -27,11 +39,11 @@ static int detect_bpftool_path(char *buffer)*/ snprintf (tmp,BPFTOOL_PATH_MAX_LEN ,"../%s" ,BPFTOOL_DEFAULT_PATH );if (access (tmp,X_OK ) ==0 ) { -strncpy (buffer, tmp,BPFTOOL_PATH_MAX_LEN ); +snprintf (buffer,BPFTOOL_PATH_MAX_LEN ,"%s" , tmp);return 0 ; } -/* Failed to find bpftool binary */ +fprintf (stderr,"Failed to detect bpftool path, use BPFTOOL env var to override\n" );return 1 ; }@@ -71,4 +83,3 @@ int get_bpftool_command_output(char *args, char *output_buf, size_t output_max_l {return run_command (args, output_buf, output_max_len); } -
Re: [PATCH bpf v2 14/15] selftests/bpf: Check BPFTOOL env var in detect_bpftool_path()
In reply to Ihor SolodraiQuoted 42 lines · Ihor Solodrai
The
bpftool_maps_accessandbpftool_metadatatests may fail on BPF CI with "command not found", depending on a workflow.
This happens becausedetect_bpftool_path()only checks two hardcoded relative paths:
-./tools/sbin/bpftool
- ../tools/sbin/bpftoolAdd support for a BPFTOOL environment variable that allows specifying the exact path to the bpftool binary.
Also replace
strncpy()withsnprintf()for proper null-termination.Signed-off-by Ihor Solodrai <[email protected]>--- tools/testing/selftests/bpf/bpftool_helpers.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)tools/testing/selftests/bpf/bpftool_helpers.c +10
-0@@ -1,5 +1,6 @@// SPDX-License-Identifier: GPL-2.0-only #include "bpftool_helpers.h" +#include <stdio.h> #include <unistd.h> #include <string.h> #include <stdbool.h> @@ -12,13 +13,24 @@static int detect_bpftool_path (char *buffer) {char tmp[BPFTOOL_PATH_MAX_LEN ]; +const char *env_path; + +/* First, check if BPFTOOL environment variable is set */ + env_path =getenv ("BPFTOOL" ); +if (env_path &&access (env_path,X_OK ) ==0 ) { +snprintf (buffer,BPFTOOL_PATH_MAX_LEN ,"%s" , env_path); +return 0 ; + }else if (env_path) { +fprintf (stderr,"bpftool '%s' doesn't exist or is not executable\n" , env_path);
tools/testing/selftests/bpf/bpftool_helpers.c line 33
Quoted 10 lines
tools/testing/selftests/bpf/bpftool_helpers.c +3
-1+return 1 ; + }/* Check default bpftool location (will work if we are running the * default flavor of test_progs) */ snprintf (tmp,BPFTOOL_PATH_MAX_LEN ,"./%s" ,BPFTOOL_DEFAULT_PATH );if (access (tmp,X_OK ) ==0 ) { -strncpy (buffer, tmp,BPFTOOL_PATH_MAX_LEN ); +snprintf (buffer,BPFTOOL_PATH_MAX_LEN ,"%s" , tmp);
I guess it's ok for user space, but
git log --oneline|grep "snprintf with strscpy"ad789a85b163 mm/cma: replace snprintf with strscpy in cma_new_area 674fb053e95d sparc: vio: Replace snprintf with strscpy in vio_create_one 2dfc417414c6 genirq/proc: Replace snprintf with strscpy in register_handler_proc f46ebb910989 block: Replace snprintf with strscpy in check_partition b66215e7b780 media: verisilicon: replace snprintf with strscpy+strlcat a86028f8e3ee staging: most: sound: replace snprintf with strscpy
and many others...
So.. should we introduce strscpy() in selftests/bpf ?
Ihor Solodrai
reviewerRe: [PATCH bpf v2 14/15] selftests/bpf: Check BPFTOOL env var in detect_bpftool_path()
Quoted 64 lines · Alexei Starovoitov
Quoted 42 lines · Ihor Solodrai
The
bpftool_maps_accessandbpftool_metadatatests may fail on BPF CI with "command not found", depending on a workflow.
This happens becausedetect_bpftool_path()only checks two hardcoded relative paths:
-./tools/sbin/bpftool
- ../tools/sbin/bpftoolAdd support for a BPFTOOL environment variable that allows specifying the exact path to the bpftool binary.
Also replace
strncpy()withsnprintf()for proper null-termination.Signed-off-by Ihor Solodrai <[email protected]>--- tools/testing/selftests/bpf/bpftool_helpers.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)tools/testing/selftests/bpf/bpftool_helpers.c +10
-0@@ -1,5 +1,6 @@// SPDX-License-Identifier: GPL-2.0-only #include "bpftool_helpers.h" +#include <stdio.h> #include <unistd.h> #include <string.h> #include <stdbool.h> @@ -12,13 +13,24 @@static int detect_bpftool_path (char *buffer) {char tmp[BPFTOOL_PATH_MAX_LEN ]; +const char *env_path; + +/* First, check if BPFTOOL environment variable is set */ + env_path =getenv ("BPFTOOL" ); +if (env_path &&access (env_path,X_OK ) ==0 ) { +snprintf (buffer,BPFTOOL_PATH_MAX_LEN ,"%s" , env_path); +return 0 ; + }else if (env_path) { +fprintf (stderr,"bpftool '%s' doesn't exist or is not executable\n" , env_path);tools/testing/selftests/bpf/bpftool_helpers.c line 33
Quoted 10 lines
tools/testing/selftests/bpf/bpftool_helpers.c +3
-1+return 1 ; + }/* Check default bpftool location (will work if we are running the * default flavor of test_progs) */ snprintf (tmp,BPFTOOL_PATH_MAX_LEN ,"./%s" ,BPFTOOL_DEFAULT_PATH );if (access (tmp,X_OK ) ==0 ) { -strncpy (buffer, tmp,BPFTOOL_PATH_MAX_LEN ); +snprintf (buffer,BPFTOOL_PATH_MAX_LEN ,"%s" , tmp);I guess it's ok for user space, but
git log --oneline|grep "snprintf with strscpy"
ad789a85b163mm/cma: replace snprintf with strscpy incma_new_area674fb053e95dsparc: vio: Replace snprintf with strscpy invio_create_one2dfc417414c6genirq/proc: Replace snprintf with strscpy inregister_handler_procf46ebb910989block: Replace snprintf with strscpy incheck_partitionb66215e7b780media: verisilicon: replace snprintf with strscpy+strlcata86028f8e3eestaging: most: sound: replace snprintf with strscpy
Quoted 2 lines
and many others...
So.. should we introducestrscpy()in selftests/bpf ?
I guess we can, but:
$ grep -r 'snprintf(' --include="*.[ch]" tools/testing/selftests/bpf/ | wc -l
238The reason to prefer strscpy() is speed, right? Can we use kernel implementation in userspace directly?
In tools/include I only see this:
#define strscpy strcpy
Ihor Solodrai
reviewerRe: [PATCH bpf v2 14/15] selftests/bpf: Check BPFTOOL env var in detect_bpftool_path()
Quoted 31 lines · Ihor Solodrai
Quoted 22 lines · Alexei Starovoitov
Review
Quoted 10 lines · Ihor Solodrai
[...]
/* Check default bpftool location (will work if we are running the * default flavor of test_progs) */ snprintf(tmp, BPFTOOL_PATH_MAX_LEN, "./%s", BPFTOOL_DEFAULT_PATH); if (access(tmp, X_OK) == 0) {(quoted diff) +1
-1- strncpy(buffer, tmp, BPFTOOL_PATH_MAX_LEN); + snprintf(buffer, BPFTOOL_PATH_MAX_LEN, "%s", tmp);I guess it's ok for user space, but
git log --oneline|grep "snprintf with strscpy"
ad789a85b163mm/cma: replace snprintf with strscpy incma_new_area674fb053e95dsparc: vio: Replace snprintf with strscpy invio_create_one2dfc417414c6genirq/proc: Replace snprintf with strscpy inregister_handler_procf46ebb910989block: Replace snprintf with strscpy incheck_partitionb66215e7b780media: verisilicon: replace snprintf with strscpy+strlcata86028f8e3eestaging: most: sound: replace snprintf with strscpyQuoted 2 lines
and many others...
So.. should we introducestrscpy()in selftests/bpf ?I guess we can, but:
$ grep -r 'snprintf(' --include="*.[ch]" tools/testing/selftests/bpf/ | wc -l 238
Quoted 7 lines
The reason to prefer
strscpy()is speed, right? Can we use kernel implementation in userspace directly?In
tools/includeI only see this:#define strscpy strcpy
I think we can add a simple implementation to tools/lib/string.c See a diff below: essentially a copy from arch/s390/boot/string.c [1]
I suppose it's faster than snprintf(). However I am not sure about going through all 238 usages, as that would touch many files. But at least we can make actual strscpy available in selftests.
I can add this in v3. Alexei, wdyt?
tools/include/linux/string.h +2 -1
@@ -3,6 +3,7 @@#define _TOOLS_LINUX_STRING_H_#include <linux/types.h> /* for size_t */ +#include <sys/types.h> /* for ssize_t */ #include <string.h> void *memdup (const void *src,size_t len);
@@ -12,7 +13,7 @@ void argv_free(char **argv);int strtobool (const char *s,bool *res); -#define strscpy strcpy +ssize_t strscpy (char *dest,const char *src,size_t count);/* * glibc based builds needs the extern while uClibc doesn't.
tools/lib/string.c +14 -0
@@ -239,3 +239,17 @@ void *memchr_inv(const void *start, int c, size_t bytes)return check_bytes8 (start, value, bytes %8 ); } + +ssize_t strscpy (char *dst,const char *src,size_t count) +{ +size_t len; + +if (count ==0 ) +return -E2BIG ; + + len =strnlen (src, count -1 ); +memcpy (dst, src, len); + dst[len] ='\0' ; + +return src[len] ? -E2BIG : len; +}
Re: [PATCH bpf v2 14/15] selftests/bpf: Check BPFTOOL env var in detect_bpftool_path()
Quoted 85 lines · Ihor Solodrai
Quoted 31 lines · Ihor Solodrai
Quoted 22 lines · Alexei Starovoitov
Review
Quoted 10 lines · Ihor Solodrai
[...]
/* Check default bpftool location (will work if we are running the * default flavor of test_progs) */ snprintf(tmp, BPFTOOL_PATH_MAX_LEN, "./%s", BPFTOOL_DEFAULT_PATH); if (access(tmp, X_OK) == 0) {(quoted diff) +1
-1- strncpy(buffer, tmp, BPFTOOL_PATH_MAX_LEN); + snprintf(buffer, BPFTOOL_PATH_MAX_LEN, "%s", tmp);I guess it's ok for user space, but
git log --oneline|grep "snprintf with strscpy"
ad789a85b163mm/cma: replace snprintf with strscpy incma_new_area674fb053e95dsparc: vio: Replace snprintf with strscpy invio_create_one2dfc417414c6genirq/proc: Replace snprintf with strscpy inregister_handler_procf46ebb910989block: Replace snprintf with strscpy incheck_partitionb66215e7b780media: verisilicon: replace snprintf with strscpy+strlcata86028f8e3eestaging: most: sound: replace snprintf with strscpyQuoted 2 lines
and many others...
So.. should we introducestrscpy()in selftests/bpf ?I guess we can, but:
$ grep -r 'snprintf(' --include="*.[ch]" tools/testing/selftests/bpf/ | wc -l 238Quoted 7 lines
The reason to prefer
strscpy()is speed, right? Can we use kernel implementation in userspace directly?In
tools/includeI only see this:#define strscpy strcpyI think we can add a simple implementation to
tools/lib/string.cSee a diff below: essentially a copy fromarch/s390/boot/string.c[1]I suppose it's faster than
snprintf(). However I am not sure about going through all 238 usages, as that would touch many files. But at least we can make actual strscpy available in selftests.I can add this in v3. Alexei, wdyt?
tools/include/linux/string.h +2
-1@@ -3,6 +3,7 @@#define _TOOLS_LINUX_STRING_H_#include <linux/types.h> /* for size_t */ +#include <sys/types.h> /* for ssize_t */ #include <string.h> void *memdup (const void *src,size_t len);@@ -12,7 +13,7 @@ void argv_free(char **argv);int strtobool (const char *s,bool *res); -#define strscpy strcpy +ssize_t strscpy (char *dest,const char *src,size_t count);/* * glibc based builds needs the extern while uClibc doesn't. tools/lib/string.c +4
-0@@ -239,3 +239,17 @@ void *memchr_inv(const void *start, int c, size_t bytes)return check_bytes8 (start, value, bytes %8 ); } + +ssize_t strscpy (char *dst,const char *src,size_t count) +{ +size_t len;
tools/lib/string.c void *memchr_inv(const void *start, int c, size_t bytes) · line 255
Quoted 10 lines
tools/lib/string.c +10
-0+ +if (count ==0 ) +return -E2BIG ; + + len =strnlen (src, count -1 ); +memcpy (dst, src, len); + dst[len] ='\0' ; + +return src[len] ? -E2BIG : len; +}
Hmm. it looks a bit like strlcpy() which is also not recommended. See Documentation/process/deprecated.rst
that explains the reasons why strscpy() is the only "approved" version.
Also tools/lib/ is too scrutinized.
Let's take sized_strscpy() from lib/string.c
drop all optimizations like word a time, page boundary tricks, etc and only keep essentially this:
while (count > 1) {
char c;
c = src[res];
dest[res] = c;
if (!c)
return res;
res++;
count--;
}
/* Force NUL-termination. */
dest[res] = '\0';
/* Return E2BIG if the source didn't stop */
return src[res] ? -E2BIG : res;and add it somewhere in selftests/bpf..
and only use it in these couple cases where we need to fix strncpy. Further snprintf() cleanup can be dealt with later.
I mainly want to avoid more churn when people will inevitably start sending patches to replace snprintf with strscpy.
Ihor Solodrai
reviewerPATCH v2 15/15 selftests/bpf: Don't override SIGSEGV handler with ASAN
In reply to Ihor Solodraitest_progs has custom SIGSEGV handler, which interferes with the address sanitizer [1]. Add an #ifndef to avoid this.
[1] https://lore.kernel.org/bpf/[email protected]/
--- tools/testing/selftests/bpf/test_progs.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
tools/testing/selftests/bpf/test_progs.c +5 -3
@@ -1944,13 +1944,15 @@ int main(int argc, char **argv) .parser = parse_arg, .doc = argp_program_doc, }; +int err, i; + +#ifndef __SANITIZE_ADDRESS__struct sigaction sigact = { .sa_handler = crash_handler, .sa_flags =SA_RESETHAND , - }; -int err, i; - + };sigaction (SIGSEGV , &sigact,NULL ); +#endif env.stdout_saved = stdout; env.stderr_saved = stderr;
Signature · 1 line
2.53.0
Re: [PATCH bpf v2 15/15] selftests/bpf: Don't override SIGSEGV handler with ASAN
Quoted 23 lines · Ihor Solodrai
test_progshas custom SIGSEGV handler, which interferes with the address sanitizer [1]. Add an #ifndef to avoid this.[1] https://lore.kernel.org/bpf/[email protected]/
Signed-off-by Ihor Solodrai <[email protected]>--- tools/testing/selftests/bpf/test_progs.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)tools/testing/selftests/bpf/test_progs.c +3
-0@@ -1944,13 +1944,15 @@ int main(int argc, char **argv) .parser = parse_arg, .doc = argp_program_doc, }; +int err, i; + +#ifndef __SANITIZE_ADDRESS__struct sigaction sigact = { .sa_handler = crash_handler,
tools/testing/selftests/bpf/test_progs.c int main(int argc, char **argv) · line 1958
Quoted 10 lines
tools/testing/selftests/bpf/test_progs.c +2
-3.sa_flags = SA_RESETHAND, - }; -int err, i; - + };sigaction (SIGSEGV , &sigact,NULL ); +#endif env.stdout_saved = stdout; env.stderr_saved = stderr;
I think this is reasonable for the use case. We may try dumping logs in |__asan_on_error(), if that proves useful.
Eduard Zingerman
maintainerRe: [PATCH bpf v2 15/15] selftests/bpf: Don't override SIGSEGV handler with ASAN
Quoted 36 lines · Mykyta Yatsenko
Quoted 30 lines · Ihor Solodrai
test_progshas custom SIGSEGV handler, which interferes with the address sanitizer [1]. Add an #ifndef to avoid this.[1] https://lore.kernel.org/bpf/[email protected]/
Signed-off-by Ihor Solodrai <[email protected]>---
tools/testing/selftests/bpf/test_progs.c| 8 +++++---1 file changed, 5 insertions(+), 3 deletions(-)tools/testing/selftests/bpf/test_progs.c +5
-3@@ -1944,13 +1944,15 @@ int main(int argc, char **argv) .parser = parse_arg, .doc = argp_program_doc, }; +int err, i; + +#ifndef __SANITIZE_ADDRESS__ struct sigaction sigact = { .sa_handler = crash_handler, .sa_flags = SA_RESETHAND, - }; -int err, i; - + }; sigaction(SIGSEGV, &sigact, NULL); +#endif Quoted 3 lines
env.stdout_saved = stdout;
env.stderr_saved = stderr;I think this is reasonable for the use case. We may try dumping logs in |__asan_on_error(), if that proves useful.
Quoted 1 line
Acked-by Mykyta Yatsenko <[email protected]>|
Agree with Mykyta, crash_handler() can be split in two parts and __asan_on_error() can be defined, calling the part doing dump_test_log().