On 17 March 2026 07:31:51 GMT, Masami Hiramatsu <[email protected]> wrote:
>On Sun, 15 Mar 2026 12:20:09 +0000
>Josh Law <[email protected]> wrote:
>
>> If fstat() fails after open() succeeds, load_xbc_file() returns
>> -errno without closing the file descriptor. Add the missing close()
>> call on the error path.
>>
>> Fixes: 950313ebf79c ("tools: bootconfig: Add bootconfig command")
>> Signed-off-by: Josh Law <[email protected]>
>> ---
>> tools/bootconfig/main.c | 4 +++-
>> 1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/tools/bootconfig/main.c b/tools/bootconfig/main.c
>> index 55d59ed507d5..8078fee0b75b 100644
>> --- a/tools/bootconfig/main.c
>> +++ b/tools/bootconfig/main.c
>> @@ -162,8 +162,10 @@ static int load_xbc_file(const char *path, char **buf)
>> if (fd < 0)
>> return -errno;
>> ret = fstat(fd, &stat);
>> - if (ret < 0)
>> + if (ret < 0) {
>> + close(fd);
>> return -errno;
>
>Sashiko.dev[1] found that close() will overwrite errno. So please make it
>
> ret = -errno;
> close(fd);
> return ret;
>
>[1]
>https://sashiko.dev/#/patchset/20260315122015.55965-1-objecting%40objecting.org
>
>Thanks,
>
>> + }
>>
>> ret = load_xbc_fd(fd, buf, stat.st_size);
>>
>> --
>> 2.34.1
>>
>
>
I'm on the computer now, I'm cleaning everything up as requested, expect a
patch coming.
V/R
Josh Law