mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-27 21:03:32 +00:00
selftests/bpf: Fix GCC11 compiler warnings in -O2 mode
When compiling selftests in -O2 mode with GCC1, we get three new compilations warnings about potentially uninitialized variables. Compiler is wrong 2 out of 3 times, but this patch makes GCC11 happy anyways, as it doesn't cost us anything and makes optimized selftests build less annoying. The amazing one is tc_redirect case of token that is malloc()'ed before ASSERT_OK_PTR() check is done on it. Seems like GCC pessimistically assumes that libbpf_get_error() will dereference the contents of the pointer (no it won't), so the only way I found to shut GCC up was to do zero-initializaing calloc(). This one was new to me. For linfo case, GCC didn't realize that linfo_size will be initialized by the function that is returning linfo_size as out parameter. core_reloc.c case was a real bug, we can goto cleanup before initializing obj. But we don't need to do any clean up, so just continue iteration intstead. Signed-off-by: Andrii Nakryiko <andrii@kernel.org> Signed-off-by: Alexei Starovoitov <ast@kernel.org> Link: https://lore.kernel.org/bpf/20220211190927.1434329-1-andrii@kernel.org
This commit is contained in:
parent
edc21dc909
commit
d3b0b80064
3 changed files with 3 additions and 3 deletions
|
@ -6556,7 +6556,7 @@ static int test_get_linfo(const struct prog_info_raw_test *test,
|
||||||
static void do_test_info_raw(unsigned int test_num)
|
static void do_test_info_raw(unsigned int test_num)
|
||||||
{
|
{
|
||||||
const struct prog_info_raw_test *test = &info_raw_tests[test_num - 1];
|
const struct prog_info_raw_test *test = &info_raw_tests[test_num - 1];
|
||||||
unsigned int raw_btf_size, linfo_str_off, linfo_size;
|
unsigned int raw_btf_size, linfo_str_off, linfo_size = 0;
|
||||||
int btf_fd = -1, prog_fd = -1, err = 0;
|
int btf_fd = -1, prog_fd = -1, err = 0;
|
||||||
void *raw_btf, *patched_linfo = NULL;
|
void *raw_btf, *patched_linfo = NULL;
|
||||||
const char *ret_next_str;
|
const char *ret_next_str;
|
||||||
|
|
|
@ -872,7 +872,7 @@ void test_core_reloc(void)
|
||||||
if (test_case->btf_src_file) {
|
if (test_case->btf_src_file) {
|
||||||
err = access(test_case->btf_src_file, R_OK);
|
err = access(test_case->btf_src_file, R_OK);
|
||||||
if (!ASSERT_OK(err, "btf_src_file"))
|
if (!ASSERT_OK(err, "btf_src_file"))
|
||||||
goto cleanup;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
open_opts.btf_custom_path = test_case->btf_src_file;
|
open_opts.btf_custom_path = test_case->btf_src_file;
|
||||||
|
|
|
@ -140,7 +140,7 @@ static struct nstoken *open_netns(const char *name)
|
||||||
int err;
|
int err;
|
||||||
struct nstoken *token;
|
struct nstoken *token;
|
||||||
|
|
||||||
token = malloc(sizeof(struct nstoken));
|
token = calloc(1, sizeof(struct nstoken));
|
||||||
if (!ASSERT_OK_PTR(token, "malloc token"))
|
if (!ASSERT_OK_PTR(token, "malloc token"))
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue