leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tools, bpftool: Exit on error in function codegen

Browse Source 
Currently, the codegen function might fail and return an error. But its
callers continue without checking its return value. Since codegen can
fail only in the unlikely case of the system running out of memory or
the static template being malformed, just exit(-1) directly from codegen
and make it void-returning.

Suggested-by: Andrii Nakryiko <andrii.nakryiko@gmail.com>
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Andrii Nakryiko <andriin@fb.com>
Link: https://lore.kernel.org/bpf/20200611103341.21532-1-tklauser@distanz.ch
This commit is contained in:
Tobias Klauser 2020-06-11 12:33:41 +02:00 committed by Daniel Borkmann
parent aa2cad0600
commit 2c4779eff8
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/bpf/bpftool/gen.c
View File

@ -200,7 +200,7 @@ out:
return err; return err;
} }
static int codegen(const char *template, ...) static void codegen(const char *template, ...)
{ {
const char *src, *end; const char *src, *end;
int skip_tabs = 0, n; int skip_tabs = 0, n;
@ -211,7 +211,7 @@ static int codegen(const char *template, ...)
n = strlen(template); n = strlen(template);
s = malloc(n + 1); s = malloc(n + 1);
if (!s) if (!s)
return -ENOMEM; exit(-1);
src = template; src = template;
dst = s; dst = s;
@ -225,7 +225,7 @@ static int codegen(const char *template, ...)
p_err("unrecognized character at pos %td in template '%s'", p_err("unrecognized character at pos %td in template '%s'",
src - template - 1, template); src - template - 1, template);
free(s); free(s);
return -EINVAL; exit(-1);
} }
} }
@ -236,7 +236,7 @@ static int codegen(const char *template, ...)
p_err("not enough tabs at pos %td in template '%s'", p_err("not enough tabs at pos %td in template '%s'",
src - template - 1, template); src - template - 1, template);
free(s); free(s);
return -EINVAL; exit(-1);
} }
} }
/* trim trailing whitespace */ /* trim trailing whitespace */
@ -257,7 +257,8 @@ static int codegen(const char *template, ...)
va_end(args); va_end(args);
free(s); free(s);
return n; if (n)
exit(-1);
} }
static int do_skeleton(int argc, char **argv) static int do_skeleton(int argc, char **argv)