Skip to content

Commit

Permalink
libbpf: Set close-on-exec flag on gzopen
Browse files Browse the repository at this point in the history
Enable the close-on-exec flag when using gzopen. This is especially important
for multithreaded programs making use of libbpf, where a fork + exec could
race with libbpf library calls, potentially resulting in a file descriptor
leaked to the new process. This got missed in 59842c5 ("libbpf: Ensure
libbpf always opens files with O_CLOEXEC").

Fixes: 59842c5 ("libbpf: Ensure libbpf always opens files with O_CLOEXEC")
Signed-off-by: Marco Vedovati <marco.vedovati@crowdstrike.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/20230810214350.106301-1-martin.kelly@crowdstrike.com
  • Loading branch information
Marco Vedovati authored and borkmann committed Aug 14, 2023
1 parent 6da4fea commit 8e50750
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions tools/lib/bpf/libbpf.c
Original file line number Diff line number Diff line change
Expand Up @@ -1978,9 +1978,9 @@ static int bpf_object__read_kconfig_file(struct bpf_object *obj, void *data)
return -ENAMETOOLONG;

/* gzopen also accepts uncompressed files. */
file = gzopen(buf, "r");
file = gzopen(buf, "re");
if (!file)
file = gzopen("/proc/config.gz", "r");
file = gzopen("/proc/config.gz", "re");

if (!file) {
pr_warn("failed to open system Kconfig\n");
Expand Down

0 comments on commit 8e50750

Please sign in to comment.