luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bpftool: Fix maybe-uninitialized warnings

Browse Source 
[ Upstream commit 4bbb3583687051ef99966ddaeb1730441b777d40 ]

Somehow when bpftool is compiled in -Og mode, compiler produces new warnings
about possibly uninitialized variables. Fix all the reported problems.

Fixes: 2119f2189d ("bpftool: add C output format option to btf dump subcommand")
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20210313210920.1959628-3-andrii@kernel.org
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Andrii Nakryiko 2021-03-13 13:09:18 -08:00 committed by Greg Kroah-Hartman
parent b1ed7a5717
commit 3d15bf2b2c
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/bpf/bpftool/btf.c
View File

@ -519,6 +519,7 @@ static int do_dump(int argc, char **argv)
NEXT_ARG(); NEXT_ARG();
if (argc < 1) { if (argc < 1) {
p_err("expecting value for 'format' option\n"); p_err("expecting value for 'format' option\n");
err = -EINVAL;
goto done; goto done;
} }
if (strcmp(*argv, "c") == 0) { if (strcmp(*argv, "c") == 0) {
@ -528,11 +529,13 @@ static int do_dump(int argc, char **argv)
} else { } else {
p_err("unrecognized format specifier: '%s', possible values: raw, c", p_err("unrecognized format specifier: '%s', possible values: raw, c",
*argv); *argv);
err = -EINVAL;
goto done; goto done;
} }
NEXT_ARG(); NEXT_ARG();
} else { } else {
p_err("unrecognized option: '%s'", *argv); p_err("unrecognized option: '%s'", *argv);
err = -EINVAL;
goto done; goto done;
} }
} }

3
tools/bpf/bpftool/main.c
View File

@ -274,7 +274,7 @@ static int do_batch(int argc, char **argv)
int n_argc; int n_argc;
FILE *fp; FILE *fp;
char *cp; char *cp;
int err; int err = 0;
int i; int i;
if (argc < 2) { if (argc < 2) {
@ -368,7 +368,6 @@ static int do_batch(int argc, char **argv)
} else { } else {
if (!json_output) if (!json_output)
printf("processed %d commands\n", lines); printf("processed %d commands\n", lines);
err = 0;
} }
err_close: err_close:
if (fp != stdin) if (fp != stdin)

2
tools/bpf/bpftool/map.c
View File

@ -99,7 +99,7 @@ static int do_dump_btf(const struct btf_dumper *d,
void *value) void *value)
{ {
__u32 value_id; __u32 value_id;
int ret; int ret = 0;
/* start of key-value pair */ /* start of key-value pair */
jsonw_start_object(d->jw); jsonw_start_object(d->jw);