Commit bfee71fb authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Daniel Borkmann

tools: bpftool: remember to close the libbpf object after prog load

Remembering to close all descriptors and free memory may not seem
important in a user space tool like bpftool, but if we were to run
in batch mode the consumed resources start to add up quickly.  Make
sure program load closes the libbpf object (which unloads and frees
it).

Fixes: 49a086c2 ("bpftool: implement prog load command")
Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarQuentin Monnet <quentin.monnet@netronome.com>
Acked-by: default avatarSong Liu <songliubraving@fb.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent 957f9a13
...@@ -695,12 +695,18 @@ static int do_load(int argc, char **argv) ...@@ -695,12 +695,18 @@ static int do_load(int argc, char **argv)
} }
if (do_pin_fd(prog_fd, argv[1])) if (do_pin_fd(prog_fd, argv[1]))
return -1; goto err_close_obj;
if (json_output) if (json_output)
jsonw_null(json_wtr); jsonw_null(json_wtr);
bpf_object__close(obj);
return 0; return 0;
err_close_obj:
bpf_object__close(obj);
return -1;
} }
static int do_help(int argc, char **argv) static int do_help(int argc, char **argv)
......
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