| Message ID | 20220319030533.3132250-1-hengqi.chen@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | d0f325c34c2fbe15f6774f2b628224280b571ae9 |
| Delegated to: | BPF |
| Headers | show |
| Series | [v2,bpf-next] libbpf: Close fd in bpf_object__reuse_map | expand |
Hello: This patch was applied to bpf/bpf-next.git (master) by Daniel Borkmann <daniel@iogearbox.net>: On Sat, 19 Mar 2022 11:05:33 +0800 you wrote: > pin_fd is dup-ed and assigned in bpf_map__reuse_fd. Close it > in bpf_object__reuse_map after reuse. > > Signed-off-by: Hengqi Chen <hengqi.chen@gmail.com> > --- > tools/lib/bpf/libbpf.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > [...] Here is the summary with links: - [v2,bpf-next] libbpf: Close fd in bpf_object__reuse_map https://git.kernel.org/bpf/bpf-next/c/d0f325c34c2f You are awesome, thank you!
diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 43161fdd44bb..843389c24dd1 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -4800,8 +4800,8 @@ bpf_object__reuse_map(struct bpf_map *map) } err = bpf_map__reuse_fd(map, pin_fd); + close(pin_fd); if (err) { - close(pin_fd); return err; } map->pinned = true;
pin_fd is dup-ed and assigned in bpf_map__reuse_fd. Close it in bpf_object__reuse_map after reuse. Signed-off-by: Hengqi Chen <hengqi.chen@gmail.com> --- tools/lib/bpf/libbpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.25.1