Re: [PATCH bpf-next] libbpf: Close fd in bpf_object__reuse_map

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



[ Cc +Toke ]

On 3/17/22 3:03 AM, Hengqi Chen wrote:
pin_fd is dup-ed and assigned in bpf_map__reuse_fd. Close it
after reuse successfully.

Fixes: 57a00f416toke@redhat.com44f ("libbpf: Add auto-pinning of maps when loading BPF objects")
Signed-off-by: Hengqi Chen <hengqi.chen@xxxxxxxxx>
---
  tools/lib/bpf/libbpf.c | 1 +
  1 file changed, 1 insertion(+)

diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index 43161fdd44bb..10ad500f1d6e 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -4804,6 +4804,7 @@ bpf_object__reuse_map(struct bpf_map *map)
  		close(pin_fd);
  		return err;
  	}
+	close(pin_fd);

Lgtm, but in that case, pls just do ...

        err = bpf_map__reuse_fd(map, pin_fd);
        close(pin_fd);
        if (err)
                return err;
        [...]

... given we close it in both branches.

  	map->pinned = true;
  	pr_debug("reused pinned map at '%s'\n", map->pin_path);




[Index of Archives]     [Linux Samsung SoC]     [Linux Rockchip SoC]     [Linux Actions SoC]     [Linux for Synopsys ARC Processors]     [Linux NFS]     [Linux NILFS]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]


  Powered by Linux