Commit c210773d authored by Yauheni Kaliuta's avatar Yauheni Kaliuta Committed by Alexei Starovoitov

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: default avatarYauheni Kaliuta <yauheni.kaliuta@redhat.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarYonghong Song <yhs@fb.com>
Link: https://lore.kernel.org/bpf/20200820115843.39454-1-yauheni.kaliuta@redhat.com
parent c8a36f19
...@@ -19,7 +19,7 @@ static int libbpf_debug_print(enum libbpf_print_level level, ...@@ -19,7 +19,7 @@ static int libbpf_debug_print(enum libbpf_print_level level,
log_buf = va_arg(args, char *); log_buf = va_arg(args, char *);
if (!log_buf) if (!log_buf)
goto out; goto out;
if (strstr(log_buf, err_str) == 0) if (err_str && strstr(log_buf, err_str) == 0)
found = true; found = true;
out: out:
printf(format, log_buf); printf(format, log_buf);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment