Commit bfee71fb authored Jun 20, 2018 by Jakub Kicinski Committed by Daniel Borkmann Jun 21, 2018

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: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Quentin Monnet <quentin.monnet@netronome.com>
Acked-by: Song Liu <songliubraving@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

parent 957f9a13

tools/bpf/bpftool/prog.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -695,12 +695,18 @@ static int do_load(int argc, char **argv)
		}

		if (do_pin_fd(prog_fd, argv[1]))
		return -1;
		goto err_close_obj;

		if (json_output)
		jsonw_null(json_wtr);

		bpf_object__close(obj);

		return 0;

		err_close_obj:
		bpf_object__close(obj);
		return -1;
		}

		static int do_help(int argc, char **argv)

Admin message