Re: [PATCH bpf-next v1] resolve_btfids: Implement --patch_btfids

[Ihor Solodrai <ihor.solodrai@linux.dev>]

On 12/30/25 4:26 PM, bot+bpf-ci@kernel.org wrote:
>> diff --git a/tools/bpf/resolve_btfids/main.c b/tools/bpf/resolve_btfids/main.c
>> index 2cbc252259be..1269efa06853 100644
>> --- a/tools/bpf/resolve_btfids/main.c
>> +++ b/tools/bpf/resolve_btfids/main.c
> 
> [ ... ]
> 
>> +static int patch_btfids(const char *btfids_path, const char *elf_path)
>> +{
>> +	Elf_Scn *scn = NULL;
>> +	FILE *btfids_file;
>> +	size_t shdrstrndx;
>> +	int fd, err = -1;
>> +	Elf_Data *data;
>> +	struct stat st;
>> +	GElf_Shdr sh;
>> +	char *name;
>> +	Elf *elf;
>> +
>> +	elf_version(EV_CURRENT);
>> +
>> +	fd = open(elf_path, O_RDWR, 0666);
>> +	if (fd < 0) {
>> +		pr_err("FAILED to open %s: %s\n", elf_path, strerror(errno));
>> +		return -1;
>> +	}
>> +
>> +	elf = elf_begin(fd, ELF_C_RDWR_MMAP, NULL);
>> +	if (!elf) {
>> +		close(fd);
>> +		pr_err("FAILED cannot create ELF descriptor: %s\n", elf_errmsg(-1));
>> +		return -1;
>> +	}
> 
> [ ... ]
> 
>> +	err = 0;
>> +out:
>> +	elf_end(elf);
>> +	return err;
>> +}
> 
> Should the file descriptor fd be closed here? Looking at elf_collect() and its
> cleanup in main(), the pattern is to call elf_end() and then close(fd)
> separately. Without close(fd), error paths that reach 'goto out' after
> successful open() and elf_begin() will leak the file descriptor.

Correct. I missed close(fd) on the happy path.

> 
> 
> ---
> AI reviewed your patch. Please fix the bug or email reply why it's not a bug.
> See: https://github.com/kernel-patches/vmtest/blob/master/ci/claude/README.md
> 
> CI run summary: https://github.com/kernel-patches/bpf/actions/runs/20608784032