diff options
| author | Yauheni Kaliuta <yauheni.kaliuta@redhat.com> | 2020-08-20 14:58:43 +0300 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2020-08-21 00:31:14 +0300 |
| commit | c210773d6c6f595f5922d56b7391fe343bc7310e (patch) | |
| tree | d62c557e148a44a174ca14b55b6efd552ec0b39c | |
| parent | c8a36f1945b2b1b3f9823b66fc2181dc069cf803 (diff) | |
| download | linux-c210773d6c6f595f5922d56b7391fe343bc7310e.tar.xz | |
bpf: selftests: global_funcs: Check err_str before strstr
The error path in libbpf.c:load_program() has calls to pr_warn()
which ends up for global_funcs tests to
test_global_funcs.c:libbpf_debug_print().
For the tests with no struct test_def::err_str initialized with a
string, it causes call of strstr() with NULL as the second argument
and it segfaults.
Fix it by calling strstr() only for non-NULL err_str.
Signed-off-by: Yauheni Kaliuta <yauheni.kaliuta@redhat.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Yonghong Song <yhs@fb.com>
Link: https://lore.kernel.org/bpf/20200820115843.39454-1-yauheni.kaliuta@redhat.com
| -rw-r--r-- | tools/testing/selftests/bpf/prog_tests/test_global_funcs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/bpf/prog_tests/test_global_funcs.c b/tools/testing/selftests/bpf/prog_tests/test_global_funcs.c index 25b068591e9a..193002b14d7f 100644 --- a/tools/testing/selftests/bpf/prog_tests/test_global_funcs.c +++ b/tools/testing/selftests/bpf/prog_tests/test_global_funcs.c @@ -19,7 +19,7 @@ static int libbpf_debug_print(enum libbpf_print_level level, log_buf = va_arg(args, char *); if (!log_buf) goto out; - if (strstr(log_buf, err_str) == 0) + if (err_str && strstr(log_buf, err_str) == 0) found = true; out: printf(format, log_buf); |